diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
| commit | 3542f6b1836d8940615104e22248bb9b7cf54f5f (patch) | |
| tree | 6808fae6dfb12bb4b7e5e0df4efbe3e0dae8c537 /drivers/net/ethernet/sun/sunvnet.c | |
| parent | pcmcia: add missing include for new pci resource handler (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.tar.xz linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.zip | |
Merge 3.19-rc5 into char-misc-next
We want the 3.19-rc5 fixes in here for our testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/sun/sunvnet.c')
| -rw-r--r-- | drivers/net/ethernet/sun/sunvnet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 45c408ef67d0..d2835bf7b4fb 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -1201,6 +1201,7 @@ static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb) segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO); if (IS_ERR(segs)) { dev->stats.tx_dropped++; + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } |