diff options
| author | David S. Miller <[email protected]> | 2020-09-18 14:12:43 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2020-09-18 14:12:43 -0700 |
| commit | d134b78ee34823c607875c77426e18c762a911ea (patch) | |
| tree | 54761f93b0cf701eab97a35762c281b1f57d591b /net/core/dev.c | |
| parent | 785a2b1036273f6b7f78740cc4b0f32ffc9846f5 (diff) | |
| parent | 4bbd026cb9037d8da0979e8725944336cf62d0c1 (diff) | |
Merge branch 'net-various-delete-duplicated-words'
Randy Dunlap says:
====================
net: various: delete duplicated words
[PATCH 1/7 net-next] net: core: delete duplicated words
[PATCH 2/7 net-next] net: rds: delete duplicated words
[PATCH 3/7 net-next] net: ipv6: delete duplicated words
[PATCH 4/7 net-next] net: bluetooth: delete duplicated words
[PATCH 5/7 net-next] net: tipc: delete duplicated words
[PATCH 6/7 net-next] net: atm: delete duplicated words
[PATCH 7/7 net-next] net: bridge: delete duplicated words
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index bd32ba6202d1..bd9c8510d86f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1131,7 +1131,7 @@ EXPORT_SYMBOL(__dev_get_by_flags); * @name: name string * * Network device names need to be valid file names to - * to allow sysfs to work. We also disallow any kind of + * allow sysfs to work. We also disallow any kind of * whitespace. */ bool dev_valid_name(const char *name) @@ -9512,7 +9512,7 @@ int __netdev_update_features(struct net_device *dev) /* driver might be less strict about feature dependencies */ features = netdev_fix_features(dev, features); - /* some features can't be enabled if they're off an an upper device */ + /* some features can't be enabled if they're off on an upper device */ netdev_for_each_upper_dev_rcu(dev, upper, iter) features = netdev_sync_upper_features(dev, upper, features); |