Commit 4ff36466 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

r8169: replace get_protocol with vlan_get_protocol

This patch is basically the same as 6e74d174 ("r8152: replace
get_protocol with vlan_get_protocol"). Use vlan_get_protocol
instead of duplicating the functionality.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 353af85e
...@@ -6510,18 +6510,6 @@ static int msdn_giant_send_check(struct sk_buff *skb) ...@@ -6510,18 +6510,6 @@ static int msdn_giant_send_check(struct sk_buff *skb)
return ret; return ret;
} }
static inline __be16 get_protocol(struct sk_buff *skb)
{
__be16 protocol;
if (skb->protocol == htons(ETH_P_8021Q))
protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
else
protocol = skb->protocol;
return protocol;
}
static bool rtl8169_tso_csum_v1(struct rtl8169_private *tp, static bool rtl8169_tso_csum_v1(struct rtl8169_private *tp,
struct sk_buff *skb, u32 *opts) struct sk_buff *skb, u32 *opts)
{ {
...@@ -6558,7 +6546,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, ...@@ -6558,7 +6546,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
return false; return false;
} }
switch (get_protocol(skb)) { switch (vlan_get_protocol(skb)) {
case htons(ETH_P_IP): case htons(ETH_P_IP):
opts[0] |= TD1_GTSENV4; opts[0] |= TD1_GTSENV4;
break; break;
...@@ -6590,7 +6578,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, ...@@ -6590,7 +6578,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
return false; return false;
} }
switch (get_protocol(skb)) { switch (vlan_get_protocol(skb)) {
case htons(ETH_P_IP): case htons(ETH_P_IP):
opts[1] |= TD1_IPv4_CS; opts[1] |= TD1_IPv4_CS;
ip_protocol = ip_hdr(skb)->protocol; ip_protocol = ip_hdr(skb)->protocol;
......
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