diff options
| author | Kirill Smelkov <kirr@mns.spb.ru> | 2012-11-10 21:11:02 +0400 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-11-11 23:32:58 +0100 |
| commit | 810f4893e93b4e074be6b7a7cc6a36a1f2c51aa8 (patch) | |
| tree | 54d462920ddcfad20c004cfb5c19581397d1e028 /drivers/net/ethernet/realtek | |
| parent | ac50974b37f2763aa8c6e6626e17694af468b9ad (diff) | |
| download | blackbird-op-linux-810f4893e93b4e074be6b7a7cc6a36a1f2c51aa8.tar.gz blackbird-op-linux-810f4893e93b4e074be6b7a7cc6a36a1f2c51aa8.zip | |
r8169: Drop tp arg from rtl8169_tx_vlan_tag()
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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2ffdce342114..248f883d4434 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -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); |
