From 5b5b15c17bb3968b7dbadc3b7f60e9c8fd4e51a9 Mon Sep 17 00:00:00 2001 From: Andrew Lunn Date: Fri, 19 Feb 2010 16:18:09 +0100 Subject: [PATCH] --- yaml --- r: 186807 b: refs/heads/master c: 8d03847c090b12694fb9fa81dbefa7b3e4f10f1d h: refs/heads/master i: 186805: 2584f46b7c96191c2f40041e9485682769709a4b 186803: 5e9aaddf3ac9f363465f08cc7987f7fc18b4e802 186799: 7ccd54747ffbd7e647778c8bc79297c61a656597 v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/routing.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 53ceb97a8d09..40b8d6644ced 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 837b8248f6206a6b08b3d6defe2946282e432679 +refs/heads/master: 8d03847c090b12694fb9fa81dbefa7b3e4f10f1d diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c index 7dc9aef9bef4..d89048beebe1 100644 --- a/trunk/drivers/staging/batman-adv/routing.c +++ b/trunk/drivers/staging/batman-adv/routing.c @@ -939,7 +939,6 @@ int recv_vis_packet(struct sk_buff *skb) struct vis_packet *vis_packet; struct ethhdr *ethhdr; int hdr_size = sizeof(struct vis_packet); - int ret; if (skb_headlen(skb) < hdr_size) return NET_RX_DROP; @@ -962,18 +961,18 @@ int recv_vis_packet(struct sk_buff *skb) case VIS_TYPE_SERVER_SYNC: /* TODO: handle fragmented skbs properly */ receive_server_sync_packet(vis_packet, skb_headlen(skb)); - ret = NET_RX_SUCCESS; break; case VIS_TYPE_CLIENT_UPDATE: /* TODO: handle fragmented skbs properly */ receive_client_update_packet(vis_packet, skb_headlen(skb)); - ret = NET_RX_SUCCESS; break; default: /* ignore unknown packet */ - ret = NET_RX_DROP; break; } - return ret; + + /* We take a copy of the data in the packet, so we should + always free the skbuf. */ + return NET_RX_DROP; }