aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2013-04-12 16:49:24 +0200
committerDavid S. Miller <davem@davemloft.net>2013-04-12 14:55:25 -0400
commitf11a869d4e38397ac81f2a3d22e8d2aeb3992b0f (patch)
tree76b59b54ed8e7fde92829689dfcdcfb135373077 /drivers/net
parentd900d12052dc2bbc124226f628314a8cfad2a97d (diff)
downloadlinux-f11a869d4e38397ac81f2a3d22e8d2aeb3992b0f.tar.gz
be2net: take care of __vlan_put_tag return value
The driver should use return value of __vlan_put_tag with appropriate NULL-check instead of old skb pointer. Signed-off-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 08e54f3d288..2886c9b63f9 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -759,8 +759,9 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
if (vlan_tx_tag_present(skb)) {
vlan_tag = be_get_tx_vlan_tag(adapter, skb);
- __vlan_put_tag(skb, vlan_tag);
- skb->vlan_tci = 0;
+ skb = __vlan_put_tag(skb, vlan_tag);
+ if (skb)
+ skb->vlan_tci = 0;
}
return skb;