The following commit has been merged in the next branch: commit 7f1b7b837c205e413a7aa078a47ec96f0c11afa7 Author: David S. Miller davem@davemloft.net Date: Tue Jul 12 10:37:21 2011 -0700
batman-adv: Kill 'feature' test macros.
Almost all of these have long outstayed their welcome.
And for every one of these macros, there are 10 features for which we didn't add macros.
Let's just delete them all, and get out of habit of doing things this way.
Signed-off-by: David S. Miller davem@davemloft.net Acked-by: Stephen Hemminger shemminger@vyatta.com Acked-by: Arnd Bergmann arnd@arndb.de Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/README b/README index 5482c45..f590c99 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 3.0. Supporting +against and should work with Linux 2.6.29 - 3.1. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)
diff --git a/soft-interface.c b/soft-interface.c index 3f20332..3e2f91f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -750,7 +750,6 @@ out: return; }
-#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops bat_netdev_ops = { .ndo_open = interface_open, .ndo_stop = interface_release, @@ -760,7 +759,6 @@ static const struct net_device_ops bat_netdev_ops = { .ndo_start_xmit = interface_tx, .ndo_validate_addr = eth_validate_addr }; -#endif
static void interface_setup(struct net_device *dev) { @@ -769,16 +767,7 @@ static void interface_setup(struct net_device *dev)
ether_setup(dev);
-#ifdef HAVE_NET_DEVICE_OPS dev->netdev_ops = &bat_netdev_ops; -#else - dev->open = interface_open; - dev->stop = interface_release; - dev->get_stats = interface_stats; - dev->set_mac_address = interface_set_mac_addr; - dev->change_mtu = interface_change_mtu; - dev->hard_start_xmit = interface_tx; -#endif dev->destructor = free_netdev; dev->tx_queue_len = 0;
@@ -885,13 +874,8 @@ void softif_destroy(struct net_device *soft_iface)
int softif_is_valid(const struct net_device *net_dev) { -#ifdef HAVE_NET_DEVICE_OPS if (net_dev->netdev_ops->ndo_start_xmit == interface_tx) return 1; -#else - if (net_dev->hard_start_xmit == interface_tx) - return 1; -#endif
return 0; }