* [PATCH] r8169: Drop tp arg from rtl8169_tx_vlan_tag()
@ 2012-11-10 17:11 Kirill Smelkov
2012-11-11 22:18 ` Francois Romieu
0 siblings, 1 reply; 2+ messages in thread
From: Kirill Smelkov @ 2012-11-10 17:11 UTC (permalink / raw)
To: Francois Romieu; +Cc: Realtek linux nic maintainers, netdev, Kirill Smelkov
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>
---
drivers/net/ethernet/realtek/r8169.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d6c6cfb..3b924d2 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1819,8 +1819,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);
--
1.8.0.267.g7a4c58c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] r8169: Drop tp arg from rtl8169_tx_vlan_tag()
2012-11-10 17:11 [PATCH] r8169: Drop tp arg from rtl8169_tx_vlan_tag() Kirill Smelkov
@ 2012-11-11 22:18 ` Francois Romieu
0 siblings, 0 replies; 2+ messages in thread
From: Francois Romieu @ 2012-11-11 22:18 UTC (permalink / raw)
To: Kirill Smelkov; +Cc: Realtek linux nic maintainers, netdev, Hayes Wang
Kirill Smelkov <kirr@mns.spb.ru> :
> 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.
Pushed to branch git://violet.fr.zoreil.com/romieu/linux davem-next.r8169
Thanks.
--
Ueimor
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-11 22:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-10 17:11 [PATCH] r8169: Drop tp arg from rtl8169_tx_vlan_tag() Kirill Smelkov
2012-11-11 22:18 ` Francois Romieu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).