Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (84 commits)
  wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev
  net: convert pegasus driver to net_device_ops
  bnx2x: Prevent eeprom set when driver is down
  net: switch kaweth driver to netdevops
  pcnet32: round off carrier watch timer
  i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM
  wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE
  wimax: fix kconfig interactions with rfkill and input layers
  wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning
  r6040: bump release number to 0.20
  r6040: warn about MAC address being unset
  r6040: check PHY status when bringing interface up
  r6040: make printks consistent with DRV_NAME
  gianfar: Fixup use of BUS_ID_SIZE
  mlx4_en: Returning real Max in get_ringparam
  mlx4_en: Consider inline packets on completion
  netdev: bfin_mac: enable bfin_mac net dev driver for BF51x
  qeth: convert to net_device_ops
  vlan: add neigh_setup
  dm9601: warn on invalid mac address
  ...

1 files changed, 5 insertions, 7 deletions

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 6248ae2502c7..1649c8ab2c2f 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -633,7 +633,7 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
         hrtimer_cancel(&op->timer);
 
         if (op->can_id != rxframe->can_id)
-                goto rx_freeskb;
+                return;
 
         /* save rx timestamp */
         op->rx_stamp = skb->tstamp;
@@ -645,19 +645,19 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
         if (op->flags & RX_RTR_FRAME) {
                 /* send reply for RTR-request (placed in op->frames[0]) */
                 bcm_can_tx(op);
-                goto rx_freeskb;
+                return;
         }
 
         if (op->flags & RX_FILTER_ID) {
                 /* the easiest case */
                 bcm_rx_update_and_send(op, &op->last_frames[0], rxframe);
-                goto rx_freeskb_starttimer;
+                goto rx_starttimer;
         }
 
         if (op->nframes == 1) {
                 /* simple compare with index 0 */
                 bcm_rx_cmp_to_index(op, 0, rxframe);
-                goto rx_freeskb_starttimer;
+                goto rx_starttimer;
         }
 
         if (op->nframes > 1) {
@@ -678,10 +678,8 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
                 }
         }
 
-rx_freeskb_starttimer:
+rx_starttimer:
         bcm_rx_starttimer(op);
-rx_freeskb:
-        kfree_skb(skb);
 }
 
 /*