diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev_addr_lists.c | 4 | ||||
-rw-r--r-- | net/ipv6/inet6_hashtables.c | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 133fd22ea287..7b39f3ed2fda 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c | |||
@@ -357,8 +357,8 @@ EXPORT_SYMBOL(dev_addr_add_multiple); | |||
357 | /** | 357 | /** |
358 | * dev_addr_del_multiple - Delete device addresses by another device | 358 | * dev_addr_del_multiple - Delete device addresses by another device |
359 | * @to_dev: device where the addresses will be deleted | 359 | * @to_dev: device where the addresses will be deleted |
360 | * @from_dev: device by which addresses the addresses will be deleted | 360 | * @from_dev: device supplying the addresses to be deleted |
361 | * @addr_type: address type - 0 means type will used from from_dev | 361 | * @addr_type: address type - 0 means type will be used from from_dev |
362 | * | 362 | * |
363 | * Deletes addresses in to device by the list of addresses in from device. | 363 | * Deletes addresses in to device by the list of addresses in from device. |
364 | * | 364 | * |
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 633a6c266136..b53197233709 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
@@ -124,7 +124,7 @@ out: | |||
124 | } | 124 | } |
125 | EXPORT_SYMBOL(__inet6_lookup_established); | 125 | EXPORT_SYMBOL(__inet6_lookup_established); |
126 | 126 | ||
127 | static int inline compute_score(struct sock *sk, struct net *net, | 127 | static inline int compute_score(struct sock *sk, struct net *net, |
128 | const unsigned short hnum, | 128 | const unsigned short hnum, |
129 | const struct in6_addr *daddr, | 129 | const struct in6_addr *daddr, |
130 | const int dif) | 130 | const int dif) |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 081dcaf6577b..ce4596ed1268 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -169,7 +169,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr, | |||
169 | return cpu_to_le16(dur); | 169 | return cpu_to_le16(dur); |
170 | } | 170 | } |
171 | 171 | ||
172 | static int inline is_ieee80211_device(struct ieee80211_local *local, | 172 | static inline int is_ieee80211_device(struct ieee80211_local *local, |
173 | struct net_device *dev) | 173 | struct net_device *dev) |
174 | { | 174 | { |
175 | return local == wdev_priv(dev->ieee80211_ptr); | 175 | return local == wdev_priv(dev->ieee80211_ptr); |