@@ -57,6 +57,8 @@
#include <linux/inet.h>
#include <linux/netdevice.h>
#include <linux/if_packet.h>
+#include <linux/if_vlan.h>
+#include "../8021q/vlan.h"
#include <linux/wireless.h>
#include <linux/kernel.h>
#include <linux/kmod.h>
@@ -680,8 +682,28 @@
if (sk->sk_type != SOCK_DGRAM)
skb_push(skb, skb->data - skb_mac_header(skb));
else if (skb->pkt_type == PACKET_OUTGOING) {
- /* Special case: outgoing packets have ll header at
head */
- skb_pull(skb, skb_network_offset(skb));
+ /* Special case: outgoing packets have ll header at
head
+ * but we must leave 802.1Q encapsulation etc. (only
for non HW vlan accelerated)
+ * encasulation len = actual header_len minus
hard_header_len
+ * packet outgoing from vlan1@eth0 on eth0 have
skb_network_offset=18, hard_header_len=14
+ */
+ int hard_header_len;
+ struct net_device *pdev;
+ hard_header_len = dev->hard_header_len;
+ pdev = dev;
+ /* if dev is vlan device, hard_header_len contains
802.1Q encap, subtract it, recursively
+ * ie. vlan3@vlan2@vlan1@eth0
+ */
+ while (is_vlan_dev(pdev)) {
+ struct net_device *real_dev =
vlan_dev_info(pdev)->real_dev;
+ hard_header_len -= pdev->hard_header_len -
real_dev->hard_header_len;
+ pdev = real_dev;
+ }
Keep 802.1Q VLAN tag on non HW vlan accelerated network card received to SOCK_DGRAM socket. Signed-off-by: Milan Dadok <milan@dadok.name> --- + + skb_pull(skb, skb_network_offset(skb) - + (skb_network_offset(skb) - hard_header_len>0 ? skb_network_offset(skb) - hard_header_len : 0)); } } -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html