Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- src/r8168_n.c 2013-06-17 12:42:48.000000000 +0100
- +++ src.good/r8168_n.c 2013-08-26 13:29:29.059243548 +0100
- @@ -2234,7 +2234,7 @@
- }
- #else
- if (opts2 & RxVlanTag)
- - __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
- + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));
- #endif
- desc->opts2 = 0;
- @@ -2295,7 +2295,7 @@
- else
- tp->cp_cmd &= ~RxChkSum;
- - if (dev->features & NETIF_F_HW_VLAN_RX)
- + if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
- tp->cp_cmd |= RxVlan;
- else
- tp->cp_cmd &= ~RxVlan;
- @@ -16195,7 +16195,7 @@
- #ifdef CONFIG_R8168_VLAN
- if (tp->mcfg != CFG_METHOD_DEFAULT) {
- - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- + dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid;
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- @@ -16210,7 +16210,7 @@
- #else
- dev->features |= NETIF_F_RXCSUM;
- dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
- - NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- + NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
- dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
- NETIF_F_HIGHDMA;
- #endif
Advertisement
Add Comment
Please, Sign In to add comment
