diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-23 03:04:18 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:07 -0400 |
commit | 6039aa73a1323edc2d6d93a22505d4dc28f38e3f (patch) | |
tree | fd1e0de2e823a0fa53234685cd21bf0f5e4b1a4d /net/bluetooth/bnep | |
parent | 4f42a8cd4905e69ba4dd694d9338aeee1bb7e9ab (diff) |
Bluetooth: Remove most of the inline usage
Only obvious cases were left as inline, mostly oneline functions.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r-- | net/bluetooth/bnep/core.c | 4 | ||||
-rw-r--r-- | net/bluetooth/bnep/netdev.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 031d7d656754..a918f6e4f003 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
@@ -306,7 +306,7 @@ static u8 __bnep_rx_hlen[] = { | |||
306 | ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */ | 306 | ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */ |
307 | }; | 307 | }; |
308 | 308 | ||
309 | static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) | 309 | static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) |
310 | { | 310 | { |
311 | struct net_device *dev = s->dev; | 311 | struct net_device *dev = s->dev; |
312 | struct sk_buff *nskb; | 312 | struct sk_buff *nskb; |
@@ -404,7 +404,7 @@ static u8 __bnep_tx_types[] = { | |||
404 | BNEP_COMPRESSED | 404 | BNEP_COMPRESSED |
405 | }; | 405 | }; |
406 | 406 | ||
407 | static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb) | 407 | static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb) |
408 | { | 408 | { |
409 | struct ethhdr *eh = (void *) skb->data; | 409 | struct ethhdr *eh = (void *) skb->data; |
410 | struct socket *sock = s->sock; | 410 | struct socket *sock = s->sock; |
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index bc4086480d97..46c9ece7b04a 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
@@ -128,7 +128,7 @@ static void bnep_net_timeout(struct net_device *dev) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | #ifdef CONFIG_BT_BNEP_MC_FILTER | 130 | #ifdef CONFIG_BT_BNEP_MC_FILTER |
131 | static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s) | 131 | static int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s) |
132 | { | 132 | { |
133 | struct ethhdr *eh = (void *) skb->data; | 133 | struct ethhdr *eh = (void *) skb->data; |
134 | 134 | ||
@@ -140,7 +140,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s | |||
140 | 140 | ||
141 | #ifdef CONFIG_BT_BNEP_PROTO_FILTER | 141 | #ifdef CONFIG_BT_BNEP_PROTO_FILTER |
142 | /* Determine ether protocol. Based on eth_type_trans. */ | 142 | /* Determine ether protocol. Based on eth_type_trans. */ |
143 | static inline u16 bnep_net_eth_proto(struct sk_buff *skb) | 143 | static u16 bnep_net_eth_proto(struct sk_buff *skb) |
144 | { | 144 | { |
145 | struct ethhdr *eh = (void *) skb->data; | 145 | struct ethhdr *eh = (void *) skb->data; |
146 | u16 proto = ntohs(eh->h_proto); | 146 | u16 proto = ntohs(eh->h_proto); |
@@ -154,7 +154,7 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb) | |||
154 | return ETH_P_802_2; | 154 | return ETH_P_802_2; |
155 | } | 155 | } |
156 | 156 | ||
157 | static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s) | 157 | static int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s) |
158 | { | 158 | { |
159 | u16 proto = bnep_net_eth_proto(skb); | 159 | u16 proto = bnep_net_eth_proto(skb); |
160 | struct bnep_proto_filter *f = s->proto_filter; | 160 | struct bnep_proto_filter *f = s->proto_filter; |