diff options
author | tcharding <me@tobin.cc> | 2017-02-09 01:56:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-10 13:37:48 -0500 |
commit | 643aa9cba0b688ffde28ac39aebec6f56fc2a8af (patch) | |
tree | c59bf18fe6faa96803acbd58bcb311d99b23886e /net/core/dev.c | |
parent | 722c9a0cebb88ac1a982285f15d5fd44f4140c66 (diff) |
net: Fix checkpatch whitespace errors
This patch fixes two trivial whitespace errors. Brace should be
on the previous line and trailing statements should be on next line.
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index b7c795017299..60a0be743cdb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -192,7 +192,8 @@ static seqcount_t devnet_rename_seq; | |||
192 | 192 | ||
193 | static inline void dev_base_seq_inc(struct net *net) | 193 | static inline void dev_base_seq_inc(struct net *net) |
194 | { | 194 | { |
195 | while (++net->dev_base_seq == 0); | 195 | while (++net->dev_base_seq == 0) |
196 | ; | ||
196 | } | 197 | } |
197 | 198 | ||
198 | static inline struct hlist_head *dev_name_hash(struct net *net, const char *name) | 199 | static inline struct hlist_head *dev_name_hash(struct net *net, const char *name) |
@@ -274,8 +275,8 @@ EXPORT_PER_CPU_SYMBOL(softnet_data); | |||
274 | * register_netdevice() inits txq->_xmit_lock and sets lockdep class | 275 | * register_netdevice() inits txq->_xmit_lock and sets lockdep class |
275 | * according to dev->type | 276 | * according to dev->type |
276 | */ | 277 | */ |
277 | static const unsigned short netdev_lock_type[] = | 278 | static const unsigned short netdev_lock_type[] = { |
278 | {ARPHRD_NETROM, ARPHRD_ETHER, ARPHRD_EETHER, ARPHRD_AX25, | 279 | ARPHRD_NETROM, ARPHRD_ETHER, ARPHRD_EETHER, ARPHRD_AX25, |
279 | ARPHRD_PRONET, ARPHRD_CHAOS, ARPHRD_IEEE802, ARPHRD_ARCNET, | 280 | ARPHRD_PRONET, ARPHRD_CHAOS, ARPHRD_IEEE802, ARPHRD_ARCNET, |
280 | ARPHRD_APPLETLK, ARPHRD_DLCI, ARPHRD_ATM, ARPHRD_METRICOM, | 281 | ARPHRD_APPLETLK, ARPHRD_DLCI, ARPHRD_ATM, ARPHRD_METRICOM, |
281 | ARPHRD_IEEE1394, ARPHRD_EUI64, ARPHRD_INFINIBAND, ARPHRD_SLIP, | 282 | ARPHRD_IEEE1394, ARPHRD_EUI64, ARPHRD_INFINIBAND, ARPHRD_SLIP, |
@@ -291,22 +292,22 @@ static const unsigned short netdev_lock_type[] = | |||
291 | ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE, | 292 | ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE, |
292 | ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; | 293 | ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; |
293 | 294 | ||
294 | static const char *const netdev_lock_name[] = | 295 | static const char *const netdev_lock_name[] = { |
295 | {"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", | 296 | "_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", |
296 | "_xmit_PRONET", "_xmit_CHAOS", "_xmit_IEEE802", "_xmit_ARCNET", | 297 | "_xmit_PRONET", "_xmit_CHAOS", "_xmit_IEEE802", "_xmit_ARCNET", |
297 | "_xmit_APPLETLK", "_xmit_DLCI", "_xmit_ATM", "_xmit_METRICOM", | 298 | "_xmit_APPLETLK", "_xmit_DLCI", "_xmit_ATM", "_xmit_METRICOM", |
298 | "_xmit_IEEE1394", "_xmit_EUI64", "_xmit_INFINIBAND", "_xmit_SLIP", | 299 | "_xmit_IEEE1394", "_xmit_EUI64", "_xmit_INFINIBAND", "_xmit_SLIP", |
299 | "_xmit_CSLIP", "_xmit_SLIP6", "_xmit_CSLIP6", "_xmit_RSRVD", | 300 | "_xmit_CSLIP", "_xmit_SLIP6", "_xmit_CSLIP6", "_xmit_RSRVD", |
300 | "_xmit_ADAPT", "_xmit_ROSE", "_xmit_X25", "_xmit_HWX25", | 301 | "_xmit_ADAPT", "_xmit_ROSE", "_xmit_X25", "_xmit_HWX25", |
301 | "_xmit_PPP", "_xmit_CISCO", "_xmit_LAPB", "_xmit_DDCMP", | 302 | "_xmit_PPP", "_xmit_CISCO", "_xmit_LAPB", "_xmit_DDCMP", |
302 | "_xmit_RAWHDLC", "_xmit_TUNNEL", "_xmit_TUNNEL6", "_xmit_FRAD", | 303 | "_xmit_RAWHDLC", "_xmit_TUNNEL", "_xmit_TUNNEL6", "_xmit_FRAD", |
303 | "_xmit_SKIP", "_xmit_LOOPBACK", "_xmit_LOCALTLK", "_xmit_FDDI", | 304 | "_xmit_SKIP", "_xmit_LOOPBACK", "_xmit_LOCALTLK", "_xmit_FDDI", |
304 | "_xmit_BIF", "_xmit_SIT", "_xmit_IPDDP", "_xmit_IPGRE", | 305 | "_xmit_BIF", "_xmit_SIT", "_xmit_IPDDP", "_xmit_IPGRE", |
305 | "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET", | 306 | "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET", |
306 | "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", | 307 | "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", |
307 | "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", | 308 | "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", |
308 | "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE", | 309 | "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE", |
309 | "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; | 310 | "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; |
310 | 311 | ||
311 | static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; | 312 | static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; |
312 | static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; | 313 | static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; |