|
@@ -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);
|