diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/wlags49_h2/wl_netdev.c | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_netdev.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index e2a7ad0..cf917e6 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -1071,8 +1071,7 @@ void wl_multicast( struct net_device *dev ) DBG_PRINT( " mc_count: %d\n", netdev_mc_count(dev)); netdev_for_each_mc_addr(ha, dev) - DBG_PRINT(" %s (%d)\n", DbgHwAddr(ha->addr), - dev->addr_len); + DBG_PRINT(" %pM (%d)\n", ha->addr, dev->addr_len); } #endif /* DBG */ @@ -1586,7 +1585,7 @@ void wl_wds_device_dealloc( struct wl_private *lp ) dev_wds->flags &= ~( IFF_UP | IFF_RUNNING ); } - kfree( dev_wds ); + free_netdev(dev_wds); lp->wds_port[count].dev = NULL; } } |
