evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac802154: cleanup open count handling

Browse source 
This patch cleanups the open_count variable increment in open and close
calls of netdev.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2014-10-28 18:21:31 +01:00 • committed by Marcel Holtmann
parent c7420c367d
commit 7445764155
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/mac802154/iface.c
View file

@ -166,19 +166,19 @@ static int mac802154_slave_open(struct net_device *dev)
set_bit(SDATA_STATE_RUNNING, &sdata->state); set_bit(SDATA_STATE_RUNNING, &sdata->state);
if (local->open_count++ == 0) { if (!local->open_count) {
res = drv_start(local); res = drv_start(local);
WARN_ON(res); WARN_ON(res);
if (res) if (res)
goto err; goto err;
} }
local->open_count++;
netif_start_queue(dev); netif_start_queue(dev);
return 0; return 0;
err: err:
/* might already be clear but that doesn't matter */ /* might already be clear but that doesn't matter */
clear_bit(SDATA_STATE_RUNNING, &sdata->state); clear_bit(SDATA_STATE_RUNNING, &sdata->state);
sdata->local->open_count--;
return res; return res;
} }
@ -252,10 +252,11 @@ static int mac802154_slave_close(struct net_device *dev)
ASSERT_RTNL(); ASSERT_RTNL();
netif_stop_queue(dev); netif_stop_queue(dev);
local->open_count--;
clear_bit(SDATA_STATE_RUNNING, &sdata->state); clear_bit(SDATA_STATE_RUNNING, &sdata->state);
if (!--local->open_count) if (!local->open_count)
drv_stop(local); drv_stop(local);
return 0; return 0;