Commit 9a107aa2 authored by John W. Linville's avatar John W. Linville

[PATCH] softmac: remove function_enter()

Remove the function_enter() debugging macros.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe0b06b1
...@@ -38,7 +38,7 @@ static void ...@@ -38,7 +38,7 @@ static void
ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net) ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net)
{ {
unsigned long flags; unsigned long flags;
function_enter();
/* Switch to correct channel for this network */ /* Switch to correct channel for this network */
mac->set_channel(mac->dev, net->channel); mac->set_channel(mac->dev, net->channel);
...@@ -64,8 +64,6 @@ ieee80211softmac_assoc_timeout(void *d) ...@@ -64,8 +64,6 @@ ieee80211softmac_assoc_timeout(void *d)
struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d; struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d;
unsigned long flags; unsigned long flags;
function_enter();
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
/* we might race against ieee80211softmac_handle_assoc_response, /* we might race against ieee80211softmac_handle_assoc_response,
* so make sure only one of us does something */ * so make sure only one of us does something */
...@@ -89,7 +87,6 @@ ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason) ...@@ -89,7 +87,6 @@ ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason)
{ {
unsigned long flags; unsigned long flags;
struct ieee80211softmac_network *found; struct ieee80211softmac_network *found;
function_enter();
if (mac->associnfo.bssvalid && mac->associated) { if (mac->associnfo.bssvalid && mac->associated) {
found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid);
...@@ -173,8 +170,6 @@ ieee80211softmac_assoc_work(void *d) ...@@ -173,8 +170,6 @@ ieee80211softmac_assoc_work(void *d)
struct ieee80211_network *net = NULL, *best = NULL; struct ieee80211_network *net = NULL, *best = NULL;
unsigned long flags; unsigned long flags;
function_enter();
/* meh */ /* meh */
if (mac->associated) if (mac->associated)
ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT);
...@@ -391,8 +386,6 @@ ieee80211softmac_handle_reassoc_req(struct net_device * dev, ...@@ -391,8 +386,6 @@ ieee80211softmac_handle_reassoc_req(struct net_device * dev,
struct ieee80211softmac_device *mac = ieee80211_priv(dev); struct ieee80211softmac_device *mac = ieee80211_priv(dev);
struct ieee80211softmac_network *network; struct ieee80211softmac_network *network;
function_enter();
network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3); network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3);
if (!network) { if (!network) {
dprintkl(KERN_INFO PFX "reassoc request from unknown network\n"); dprintkl(KERN_INFO PFX "reassoc request from unknown network\n");
......
...@@ -36,8 +36,6 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac, ...@@ -36,8 +36,6 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
struct ieee80211softmac_auth_queue_item *auth; struct ieee80211softmac_auth_queue_item *auth;
unsigned long flags; unsigned long flags;
function_enter();
if (net->authenticating) if (net->authenticating)
return 0; return 0;
...@@ -78,8 +76,6 @@ ieee80211softmac_auth_queue(void *data) ...@@ -78,8 +76,6 @@ ieee80211softmac_auth_queue(void *data)
struct ieee80211softmac_network *net; struct ieee80211softmac_network *net;
unsigned long flags; unsigned long flags;
function_enter();
auth = (struct ieee80211softmac_auth_queue_item *)data; auth = (struct ieee80211softmac_auth_queue_item *)data;
net = auth->net; net = auth->net;
mac = auth->mac; mac = auth->mac;
...@@ -128,8 +124,6 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth) ...@@ -128,8 +124,6 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
unsigned long flags; unsigned long flags;
u8 * data; u8 * data;
function_enter();
/* Find correct auth queue item */ /* Find correct auth queue item */
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
list_for_each(list_ptr, &mac->auth_queue) { list_for_each(list_ptr, &mac->auth_queue) {
...@@ -277,8 +271,6 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac, ...@@ -277,8 +271,6 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac,
struct list_head *list_ptr; struct list_head *list_ptr;
unsigned long flags; unsigned long flags;
function_enter();
/* Lock and reset status flags */ /* Lock and reset status flags */
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
net->authenticating = 0; net->authenticating = 0;
...@@ -320,8 +312,6 @@ ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac, ...@@ -320,8 +312,6 @@ ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac,
{ {
int ret; int ret;
function_enter();
/* Make sure the network is authenticated */ /* Make sure the network is authenticated */
if (!net->authenticated) if (!net->authenticated)
{ {
...@@ -348,8 +338,6 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de ...@@ -348,8 +338,6 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
struct ieee80211softmac_network *net = NULL; struct ieee80211softmac_network *net = NULL;
struct ieee80211softmac_device *mac = ieee80211_priv(dev); struct ieee80211softmac_device *mac = ieee80211_priv(dev);
function_enter();
if (!deauth) { if (!deauth) {
dprintk("deauth without deauth packet. eek!\n"); dprintk("deauth without deauth packet. eek!\n");
return 0; return 0;
......
...@@ -75,15 +75,6 @@ ...@@ -75,15 +75,6 @@
# define dprintk(f, x...) do { /* nothing */ } while (0) # define dprintk(f, x...) do { /* nothing */ } while (0)
#endif #endif
#ifdef function_enter
# undef function_enter
#endif
#ifdef CONFIG_IEEE80211_SOFTMAC_DEBUG
# define function_enter() do { printk(KERN_DEBUG PFX "%s:%d:%s()\n", __FILE__, __LINE__, __FUNCTION__); } while (0)
#else
# define function_enter() do { /* nothing */ } while (0)
#endif
/* private definitions and prototypes */ /* private definitions and prototypes */
/*** prototypes from _scan.c */ /*** prototypes from _scan.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment