aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-04-22 19:24:19 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-22 19:24:19 -0400
commite5905c8352805373784b9df045de6f2864ab62ce (patch)
tree0fb0f586a7b247cc17db8896b51348a121ba9b4a /drivers/net/ethernet/ibm
parentnet: sctp: minor: remove dead code from sctp_packet (diff)
downloadlinux-dev-e5905c8352805373784b9df045de6f2864ab62ce.tar.xz
linux-dev-e5905c8352805373784b9df045de6f2864ab62ce.zip
net: Fix some __vlan_hwaccel_put_tag() callers.
Several call sites were missed when the protocol argument was added to __vlan_hwaccel_put_tag() in commit 86a9bad3ab6b6f858fd4443b48738cabbb6d094c ("net: vlan: add protocol argument to packet tagging functions"). Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index d1812aacbc7b..1901ceb47dbf 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -725,7 +725,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
processed_bytes += skb->len;
if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)
- __vlan_hwaccel_put_tag(skb, cqe->vlan_tag);
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ cqe->vlan_tag);
napi_gro_receive(&pr->napi, skb);
} else {