Commit 810f4893 authored by Kirill Smelkov's avatar Kirill Smelkov Committed by Francois Romieu

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: default avatarKirill Smelkov <kirr@mns.spb.ru>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent ac50974b
...@@ -1814,8 +1814,7 @@ static int rtl8169_set_features(struct net_device *dev, ...@@ -1814,8 +1814,7 @@ static int rtl8169_set_features(struct net_device *dev,
} }
static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp, static inline u32 rtl8169_tx_vlan_tag(struct sk_buff *skb)
struct sk_buff *skb)
{ {
return (vlan_tx_tag_present(skb)) ? return (vlan_tx_tag_present(skb)) ?
TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00; TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
...@@ -5816,7 +5815,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, ...@@ -5816,7 +5815,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
tp->tx_skb[entry].len = len; tp->tx_skb[entry].len = len;
txd->addr = cpu_to_le64(mapping); 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; opts[0] = DescOwn;
rtl8169_tso_csum(tp, skb, opts); rtl8169_tso_csum(tp, skb, opts);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment