diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-25 16:15:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-25 16:18:10 -0700 |
| commit | 1d5873e9d75bb72012a6c1327a368d0d2b13581f (patch) | |
| tree | 20f4d5b75bdffbf1945008aabec946b8ff3f5053 /net/batman-adv/gateway_common.c | |
| parent | 7665de15642dfb1709177517aa0488162727342c (diff) | |
| parent | a513088d022c8f59cebe17c567797c220563b517 (diff) | |
| download | blackbird-op-linux-1d5873e9d75bb72012a6c1327a368d0d2b13581f.tar.gz blackbird-op-linux-1d5873e9d75bb72012a6c1327a368d0d2b13581f.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- yet another batch of 'namespace cleaning' patches
Conflicts:
net/batman-adv/translation-table.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/gateway_common.c')
| -rw-r--r-- | net/batman-adv/gateway_common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 3700562cf276..6edf37f9a15c 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -22,7 +22,7 @@ #include "gateway_client.h" /* calculates the gateway class from kbit */ -static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class) +static void batadv_kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class) { int mdown = 0, tdown, tup, difference; uint8_t sbit, part; @@ -73,8 +73,8 @@ void batadv_gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up) *up = ((upart + 1) * (*down)) / 8; } -static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, - int *up, int *down) +static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, + int *up, int *down) { int ret, multi = 1; char *slash_ptr, *tmp_ptr; @@ -142,7 +142,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, int up = 0, down = 0; bool ret; - ret = parse_gw_bandwidth(net_dev, buff, &up, &down); + ret = batadv_parse_gw_bandwidth(net_dev, buff, &up, &down); if (!ret) goto end; @@ -152,7 +152,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, if (!up) up = down / 5; - kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp); + batadv_kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp); /* the gw bandwidth we guessed above might not match the given * speeds, hence we need to calculate it back to show the number |
