aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-14 22:53:41 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:07:28 -0500
commit7e226272fcf9c1ec8b67fac995ce4227f4f76971 (patch)
tree1eaa955793494207f5651cdb78078b9db4c34fb1 /drivers/net/wireless/libertas/main.c
parenteae86bf378de981696697426831bd9db68930740 (diff)
libertas: kill whitespace at end of lines
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b51513fb59ec..0dc7de6a067b 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -255,7 +255,7 @@ static int lbs_add_rtap(struct lbs_private *priv);
255static void lbs_remove_rtap(struct lbs_private *priv); 255static void lbs_remove_rtap(struct lbs_private *priv);
256static int lbs_add_mesh(struct lbs_private *priv); 256static int lbs_add_mesh(struct lbs_private *priv);
257static void lbs_remove_mesh(struct lbs_private *priv); 257static void lbs_remove_mesh(struct lbs_private *priv);
258 258
259 259
260/** 260/**
261 * Get function for sysfs attribute rtap 261 * Get function for sysfs attribute rtap
@@ -347,7 +347,7 @@ static ssize_t lbs_mesh_set(struct device *dev,
347 ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel); 347 ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel);
348 if (ret) 348 if (ret)
349 return ret; 349 return ret;
350 350
351 if (enable) 351 if (enable)
352 lbs_add_mesh(priv); 352 lbs_add_mesh(priv);
353 else 353 else
@@ -401,7 +401,7 @@ static int lbs_dev_open(struct net_device *dev)
401 netif_carrier_on(dev); 401 netif_carrier_on(dev);
402 } else { 402 } else {
403 priv->infra_open = 1; 403 priv->infra_open = 1;
404 404
405 if (priv->connect_status == LBS_CONNECTED) 405 if (priv->connect_status == LBS_CONNECTED)
406 netif_carrier_on(dev); 406 netif_carrier_on(dev);
407 else 407 else
@@ -433,7 +433,7 @@ static int lbs_mesh_stop(struct net_device *dev)
433 433
434 netif_stop_queue(dev); 434 netif_stop_queue(dev);
435 netif_carrier_off(dev); 435 netif_carrier_off(dev);
436 436
437 spin_unlock_irq(&priv->driver_lock); 437 spin_unlock_irq(&priv->driver_lock);
438 return 0; 438 return 0;
439} 439}
@@ -453,7 +453,7 @@ static int lbs_eth_stop(struct net_device *dev)
453 priv->infra_open = 0; 453 priv->infra_open = 0;
454 454
455 netif_stop_queue(dev); 455 netif_stop_queue(dev);
456 456
457 spin_unlock_irq(&priv->driver_lock); 457 spin_unlock_irq(&priv->driver_lock);
458 return 0; 458 return 0;
459} 459}
@@ -850,7 +850,7 @@ int lbs_suspend(struct lbs_private *priv)
850 } 850 }
851 851
852 memset(&cmd, 0, sizeof(cmd)); 852 memset(&cmd, 0, sizeof(cmd));
853 853
854 ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd, 854 ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd,
855 sizeof(cmd), lbs_suspend_callback, 0); 855 sizeof(cmd), lbs_suspend_callback, 0);
856 if (ret) 856 if (ret)
@@ -1180,7 +1180,7 @@ int lbs_start_card(struct lbs_private *priv)
1180 /* Enable mesh, if supported, and work out which TLV it uses. 1180 /* Enable mesh, if supported, and work out which TLV it uses.
1181 0x100 + 291 is an unofficial value used in 5.110.20.pXX 1181 0x100 + 291 is an unofficial value used in 5.110.20.pXX
1182 0x100 + 37 is the official value used in 5.110.21.pXX 1182 0x100 + 37 is the official value used in 5.110.21.pXX
1183 but we check them in that order because 20.pXX doesn't 1183 but we check them in that order because 20.pXX doesn't
1184 give an error -- it just silently fails. */ 1184 give an error -- it just silently fails. */
1185 1185
1186 /* 5.110.20.pXX firmware will fail the command if the channel 1186 /* 5.110.20.pXX firmware will fail the command if the channel