Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/ipv4/fib_frontend.c
This commit is contained in:
@@ -891,7 +891,6 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
|
||||
|
||||
SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);
|
||||
|
||||
netif_stop_queue(dev);
|
||||
}
|
||||
|
||||
static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
|
||||
|
Reference in New Issue
Block a user