r8169: Drop tp arg from rtl8169_tx_vlan_tag()
authorKirill Smelkov <kirr@mns.spb.ru>
Sat, 10 Nov 2012 17:11:02 +0000 (21:11 +0400)
committerFrancois Romieu <romieu@fr.zoreil.com>
Sun, 11 Nov 2012 22:32:58 +0000 (23:32 +0100)
Since eab6d18d (vlan: Don't check for vlan group before
vlan_tx_tag_present.) we don't check tp->vlgrp and thus
tp is not needed in this function.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
drivers/net/ethernet/realtek/r8169.c

index 2ffdce342114454005098858c4ea59dcf79a7577..248f883d4434383b5e6400b181d9faae7dbb7e2e 100644 (file)
@@ -1814,8 +1814,7 @@ static int rtl8169_set_features(struct net_device *dev,
 }
 
 
-static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
-                                     struct sk_buff *skb)
+static inline u32 rtl8169_tx_vlan_tag(struct sk_buff *skb)
 {
        return (vlan_tx_tag_present(skb)) ?
                TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
@@ -5816,7 +5815,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
        tp->tx_skb[entry].len = len;
        txd->addr = cpu_to_le64(mapping);
 
-       opts[1] = cpu_to_le32(rtl8169_tx_vlan_tag(tp, skb));
+       opts[1] = cpu_to_le32(rtl8169_tx_vlan_tag(skb));
        opts[0] = DescOwn;
 
        rtl8169_tso_csum(tp, skb, opts);