diff options
Diffstat (limited to 'drivers/net/ethernet/jme.c')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 0519afa413d2..070a6f1a0577 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -1059,7 +1059,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)  		if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {  			u16 vid = le16_to_cpu(rxdesc->descwb.vlan); -			__vlan_hwaccel_put_tag(skb, vid); +			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);  			NET_STAT(jme).rx_bytes += 4;  		}  		jme->jme_rx(skb); @@ -3030,8 +3030,8 @@ jme_init_one(struct pci_dev *pdev,  						NETIF_F_SG |  						NETIF_F_TSO |  						NETIF_F_TSO6 | -						NETIF_F_HW_VLAN_TX | -						NETIF_F_HW_VLAN_RX; +						NETIF_F_HW_VLAN_CTAG_TX | +						NETIF_F_HW_VLAN_CTAG_RX;  	if (using_dac)  		netdev->features	|=	NETIF_F_HIGHDMA; | 
