]> bbs.cooldavid.org Git - jme.git/commitdiff
net: remove use of ndo_set_multicast_list in drivers
authorJiri Pirko <jpirko@redhat.com>
Tue, 16 Aug 2011 06:29:01 +0000 (06:29 +0000)
committerGuo-Fu Tseng <cooldavid@cooldavid.org>
Fri, 24 Feb 2012 02:38:54 +0000 (10:38 +0800)
replace it by ndo_set_rx_mode

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
jme.c
jme.h

diff --git a/jme.c b/jme.c
index 7dae9b86c92964ce46ccb28aafc440be877b57e9..2695a8e324e2a05ff1a9ac2a6898e648f0ed4764 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -3112,7 +3112,11 @@ static const struct net_device_ops jme_netdev_ops = {
        .ndo_do_ioctl           = jme_ioctl,
        .ndo_start_xmit         = jme_start_xmit,
        .ndo_set_mac_address    = jme_set_macaddr,
+#ifndef __USE_NDO_SET_RX_MODE__
        .ndo_set_multicast_list = jme_set_multi,
+#else
+       .ndo_set_rx_mode        = jme_set_multi,
+#endif
        .ndo_change_mtu         = jme_change_mtu,
        .ndo_tx_timeout         = jme_tx_timeout,
 #ifndef __UNIFY_VLAN_RX_PATH__
diff --git a/jme.h b/jme.h
index a2402407e783ff3b6f0213454def1f74d4867dec..126f6fafb471b7ea166074ee8d88553b12fe7e50 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -118,6 +118,7 @@ do {                                                                        \
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
 #define __UNIFY_VLAN_RX_PATH__
+#define __USE_NDO_SET_RX_MODE__
 #endif
 
 /*