diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-26 10:48:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-26 10:50:09 -0700 |
| commit | 280bdcad857b781d701153054f524a1b3a1a2a50 (patch) | |
| tree | bee45b7d5e112f56a5bbcccfddb5b06316482167 /drivers/staging/rtl8192e | |
| parent | cf9f1155592091687b02e64a40c41d6a482985cd (diff) | |
| parent | faae60d232df564ee5e88237fd816a6d3719a8c0 (diff) | |
| download | talos-op-linux-280bdcad857b781d701153054f524a1b3a1a2a50.tar.gz talos-op-linux-280bdcad857b781d701153054f524a1b3a1a2a50.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging-next
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (25 commits)
rtl8192e: update for ndo_set_multicast_list removal.
staging: rtl8192e: Add endian checking switch to Makefile
staging: rtl8192e: Fix sparse (non-endian) warnings - Part II
staging: rtl8192e: Fix sparse (non-endian) messages - Part I
staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XI
staging: rtl8192e: Cleanup checkpatch -f errors - Part X
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VII
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VI
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part V
staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IV
...
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index f803c96dc83b..6530058eab6c 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -2868,7 +2868,7 @@ static const struct net_device_ops rtl8192_netdev_ops = { .ndo_stop = rtl8192_close, .ndo_tx_timeout = rtl8192_tx_timeout, .ndo_do_ioctl = rtl8192_ioctl, - .ndo_set_multicast_list = r8192_set_multicast, + .ndo_set_rx_mode = r8192_set_multicast, .ndo_set_mac_address = r8192_set_mac_adr, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, |
