From babd9e80ec6ce2b086423801dfa9ffe2503ea7cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Sep 2022 14:43:38 +0200 Subject: [PATCH] fix build warning in queue-5.10/net-socket-remove-register_gifconf.patch --- .../net-socket-remove-register_gifconf.patch | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/queue-5.10/net-socket-remove-register_gifconf.patch b/queue-5.10/net-socket-remove-register_gifconf.patch index 764ca535e25..59838a9e5fd 100644 --- a/queue-5.10/net-socket-remove-register_gifconf.patch +++ b/queue-5.10/net-socket-remove-register_gifconf.patch @@ -18,17 +18,15 @@ Signed-off-by: David S. Miller Stable-dep-of: 5641c751fe2f ("net: enetc: deny offload of tc-based TSN features on VF interfaces") Signed-off-by: Sasha Levin --- - include/linux/inetdevice.h | 9 ++++++++ - include/linux/netdevice.h | 8 ------- - net/core/dev_ioctl.c | 43 +++++++++----------------------------- - net/ipv4/devinet.c | 4 +--- - 4 files changed, 20 insertions(+), 44 deletions(-) + include/linux/inetdevice.h | 9 +++++++++ + include/linux/netdevice.h | 8 -------- + net/core/dev_ioctl.c | 44 ++++++++++---------------------------------- + net/ipv4/devinet.c | 4 +--- + 4 files changed, 20 insertions(+), 45 deletions(-) -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index b68fca08be27..3088d94684c1 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h -@@ -178,6 +178,15 @@ static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) +@@ -178,6 +178,15 @@ static inline struct net_device *ip_dev_ int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b); int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *); @@ -44,11 +42,9 @@ index b68fca08be27..3088d94684c1 100644 void devinet_init(void); struct in_device *inetdev_by_index(struct net *, int); __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope); -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 6564fb4ac49e..ef75567efd27 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -3201,14 +3201,6 @@ static inline bool dev_has_header(const struct net_device *dev) +@@ -3201,14 +3201,6 @@ static inline bool dev_has_header(const return dev->header_ops && dev->header_ops->create; } @@ -63,8 +59,6 @@ index 6564fb4ac49e..ef75567efd27 100644 #ifdef CONFIG_NET_FLOW_LIMIT #define FLOW_LIMIT_HISTORY (1 << 7) /* must be ^2 and !overflow buckets */ struct sd_flow_limit { -diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c -index 54fb18b4f55e..48afea19d3e1 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -1,6 +1,7 @@ @@ -75,7 +69,7 @@ index 54fb18b4f55e..48afea19d3e1 100644 #include #include #include -@@ -25,26 +26,6 @@ static int dev_ifname(struct net *net, struct ifreq *ifr) +@@ -25,26 +26,6 @@ static int dev_ifname(struct net *net, s return netdev_get_name(net, ifr->ifr_name, ifr->ifr_ifindex); } @@ -102,7 +96,15 @@ index 54fb18b4f55e..48afea19d3e1 100644 /* * Perform a SIOCGIFCONF call. This structure will change * size eventually, and there is nothing I can do about it. -@@ -72,19 +53,15 @@ int dev_ifconf(struct net *net, struct ifconf *ifc, int size) +@@ -57,7 +38,6 @@ int dev_ifconf(struct net *net, struct i + char __user *pos; + int len; + int total; +- int i; + + /* + * Fetch the caller's info block. +@@ -72,19 +52,15 @@ int dev_ifconf(struct net *net, struct i total = 0; for_each_netdev(net, dev) { @@ -131,11 +133,9 @@ index 54fb18b4f55e..48afea19d3e1 100644 } /* -diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index 8f1753875550..88b6120878cd 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -1244,7 +1244,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr) +@@ -1244,7 +1244,7 @@ out: return ret; } @@ -153,6 +153,3 @@ index 8f1753875550..88b6120878cd 100644 register_netdevice_notifier(&ip_netdev_notifier); queue_delayed_work(system_power_efficient_wq, &check_lifetime_work, 0); --- -2.35.1 - -- 2.47.3