Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/realtek/r8169.c

+2 −3
Original line number Diff line number Diff line
@@ -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);