Skip to content

Commit

Permalink
r8169: Drop tp arg from rtl8169_tx_vlan_tag()
Browse files Browse the repository at this point in the history
Since eab6d18 (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>
  • Loading branch information
Kirill Smelkov authored and Francois Romieu committed Nov 11, 2012
1 parent ac50974 commit 810f489
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 810f489

Please sign in to comment.