ipq806x_nss: bump to k6.6.98
This commit is contained in:
@@ -62,7 +62,7 @@
|
|||||||
{
|
{
|
||||||
--- a/include/linux/netdevice.h
|
--- a/include/linux/netdevice.h
|
||||||
+++ b/include/linux/netdevice.h
|
+++ b/include/linux/netdevice.h
|
||||||
@@ -4692,6 +4692,15 @@ void dev_uc_flush(struct net_device *dev
|
@@ -4693,6 +4693,15 @@ void dev_uc_flush(struct net_device *dev
|
||||||
void dev_uc_init(struct net_device *dev);
|
void dev_uc_init(struct net_device *dev);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
|
|
||||||
#define BR_HASH_BITS 8
|
#define BR_HASH_BITS 8
|
||||||
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
|
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
|
||||||
@@ -1933,12 +1934,25 @@ extern const struct nf_br_ops __rcu *nf_
|
@@ -1942,12 +1943,25 @@ extern const struct nf_br_ops __rcu *nf_
|
||||||
int br_nf_core_init(void);
|
int br_nf_core_init(void);
|
||||||
void br_nf_core_fini(void);
|
void br_nf_core_fini(void);
|
||||||
void br_netfilter_rtable_init(struct net_bridge *);
|
void br_netfilter_rtable_init(struct net_bridge *);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Signed-off-by: Ken Zhu <quic_guigenz@quicinc.com>
|
|||||||
|
|
||||||
--- a/include/linux/netdevice.h
|
--- a/include/linux/netdevice.h
|
||||||
+++ b/include/linux/netdevice.h
|
+++ b/include/linux/netdevice.h
|
||||||
@@ -3163,6 +3163,8 @@ static inline int dev_direct_xmit(struct
|
@@ -3164,6 +3164,8 @@ static inline int dev_direct_xmit(struct
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
||||||
rx_handler_func_t *br_get_rx_handler(const struct net_device *dev);
|
rx_handler_func_t *br_get_rx_handler(const struct net_device *dev);
|
||||||
|
|
||||||
@@ -2283,4 +2284,8 @@ void br_do_suppress_nd(struct sk_buff *s
|
@@ -2292,4 +2293,8 @@ void br_do_suppress_nd(struct sk_buff *s
|
||||||
u16 vid, struct net_bridge_port *p, struct nd_msg *msg);
|
u16 vid, struct net_bridge_port *p, struct nd_msg *msg);
|
||||||
struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);
|
struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);
|
||||||
bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid);
|
bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid);
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ Signed-off-by: Amitesh Anand <quic_amitesh@quicinc.com>
|
|||||||
|
|
||||||
#define BR_HASH_BITS 8
|
#define BR_HASH_BITS 8
|
||||||
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
|
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
|
||||||
@@ -2288,4 +2289,12 @@ bool br_is_neigh_suppress_enabled(const
|
@@ -2297,4 +2298,12 @@ bool br_is_neigh_suppress_enabled(const
|
||||||
#define __br_get(__hook, __default, __args ...) \
|
#define __br_get(__hook, __default, __args ...) \
|
||||||
(__hook ? (__hook(__args)) : (__default))
|
(__hook ? (__hook(__args)) : (__default))
|
||||||
|
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ Signed-off-by: Murat Sezgin <quic_msezgin@quicinc.com>
|
|||||||
const struct net_device_ops *netdev_ops;
|
const struct net_device_ops *netdev_ops;
|
||||||
const struct xdp_metadata_ops *xdp_metadata_ops;
|
const struct xdp_metadata_ops *xdp_metadata_ops;
|
||||||
int ifindex;
|
int ifindex;
|
||||||
@@ -4297,7 +4326,6 @@ static inline bool netif_dormant(const s
|
@@ -4298,7 +4327,6 @@ static inline bool netif_dormant(const s
|
||||||
return test_bit(__LINK_STATE_DORMANT, &dev->state);
|
return test_bit(__LINK_STATE_DORMANT, &dev->state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,7 +112,7 @@ Signed-off-by: Murat Sezgin <quic_msezgin@quicinc.com>
|
|||||||
/**
|
/**
|
||||||
* netif_testing_on - mark device as under test.
|
* netif_testing_on - mark device as under test.
|
||||||
* @dev: network device
|
* @dev: network device
|
||||||
@@ -5249,6 +5277,11 @@ static inline bool netif_is_failover_sla
|
@@ -5250,6 +5278,11 @@ static inline bool netif_is_failover_sla
|
||||||
return dev->priv_flags & IFF_FAILOVER_SLAVE;
|
return dev->priv_flags & IFF_FAILOVER_SLAVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
int link_reporting;
|
int link_reporting;
|
||||||
int res = 0, i;
|
int res = 0, i;
|
||||||
|
|
||||||
@@ -2325,6 +2355,13 @@ int bond_enslave(struct net_device *bond
|
@@ -2336,6 +2366,13 @@ skip_mac_set:
|
||||||
bond_is_active_slave(new_slave) ? "an active" : "a backup",
|
bond_is_active_slave(new_slave) ? "an active" : "a backup",
|
||||||
new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
|
new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
|
||||||
|
|
||||||
@@ -316,7 +316,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
/* enslave is successful */
|
/* enslave is successful */
|
||||||
bond_queue_slave_event(new_slave);
|
bond_queue_slave_event(new_slave);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2390,6 +2427,13 @@ err_undo_flags:
|
@@ -2401,6 +2438,13 @@ err_undo_flags:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -330,7 +330,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2411,6 +2455,7 @@ static int __bond_release_one(struct net
|
@@ -2422,6 +2466,7 @@ static int __bond_release_one(struct net
|
||||||
struct bonding *bond = netdev_priv(bond_dev);
|
struct bonding *bond = netdev_priv(bond_dev);
|
||||||
struct slave *slave, *oldcurrent;
|
struct slave *slave, *oldcurrent;
|
||||||
struct sockaddr_storage ss;
|
struct sockaddr_storage ss;
|
||||||
@@ -338,7 +338,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
int old_flags = bond_dev->flags;
|
int old_flags = bond_dev->flags;
|
||||||
netdev_features_t old_features = bond_dev->features;
|
netdev_features_t old_features = bond_dev->features;
|
||||||
|
|
||||||
@@ -2433,6 +2478,13 @@ static int __bond_release_one(struct net
|
@@ -2444,6 +2489,13 @@ static int __bond_release_one(struct net
|
||||||
|
|
||||||
bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);
|
bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);
|
||||||
|
|
||||||
@@ -352,7 +352,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
bond_sysfs_slave_del(slave);
|
bond_sysfs_slave_del(slave);
|
||||||
|
|
||||||
/* recompute stats just before removing the slave */
|
/* recompute stats just before removing the slave */
|
||||||
@@ -2761,8 +2813,8 @@ static void bond_miimon_commit(struct bo
|
@@ -2772,8 +2824,8 @@ static void bond_miimon_commit(struct bo
|
||||||
struct slave *slave, *primary, *active;
|
struct slave *slave, *primary, *active;
|
||||||
bool do_failover = false;
|
bool do_failover = false;
|
||||||
struct list_head *iter;
|
struct list_head *iter;
|
||||||
@@ -363,7 +363,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
|
|
||||||
bond_for_each_slave(bond, slave, iter) {
|
bond_for_each_slave(bond, slave, iter) {
|
||||||
switch (slave->link_new_state) {
|
switch (slave->link_new_state) {
|
||||||
@@ -2800,6 +2852,10 @@ static void bond_miimon_commit(struct bo
|
@@ -2811,6 +2863,10 @@ static void bond_miimon_commit(struct bo
|
||||||
bond_set_active_slave(slave);
|
bond_set_active_slave(slave);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,7 +374,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n",
|
slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n",
|
||||||
slave->speed == SPEED_UNKNOWN ? 0 : slave->speed,
|
slave->speed == SPEED_UNKNOWN ? 0 : slave->speed,
|
||||||
slave->duplex ? "full" : "half");
|
slave->duplex ? "full" : "half");
|
||||||
@@ -2848,6 +2904,14 @@ static void bond_miimon_commit(struct bo
|
@@ -2859,6 +2915,14 @@ static void bond_miimon_commit(struct bo
|
||||||
unblock_netpoll_tx();
|
unblock_netpoll_tx();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -389,7 +389,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
bond_set_carrier(bond);
|
bond_set_carrier(bond);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4100,11 +4164,221 @@ static inline u32 bond_eth_hash(struct s
|
@@ -4111,11 +4175,221 @@ static inline u32 bond_eth_hash(struct s
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ep = (struct ethhdr *)(data + mhoff);
|
ep = (struct ethhdr *)(data + mhoff);
|
||||||
@@ -612,7 +612,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
{
|
{
|
||||||
const struct ipv6hdr *iph6;
|
const struct ipv6hdr *iph6;
|
||||||
const struct iphdr *iph;
|
const struct iphdr *iph;
|
||||||
@@ -5230,15 +5504,16 @@ static netdev_tx_t bond_3ad_xor_xmit(str
|
@@ -5241,15 +5515,16 @@ static netdev_tx_t bond_3ad_xor_xmit(str
|
||||||
struct net_device *dev)
|
struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct bonding *bond = netdev_priv(dev);
|
struct bonding *bond = netdev_priv(dev);
|
||||||
@@ -636,7 +636,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* in broadcast mode, we send everything to all usable interfaces. */
|
/* in broadcast mode, we send everything to all usable interfaces. */
|
||||||
@@ -5488,8 +5763,9 @@ static netdev_tx_t __bond_start_xmit(str
|
@@ -5499,8 +5774,9 @@ static netdev_tx_t __bond_start_xmit(str
|
||||||
return bond_xmit_roundrobin(skb, dev);
|
return bond_xmit_roundrobin(skb, dev);
|
||||||
case BOND_MODE_ACTIVEBACKUP:
|
case BOND_MODE_ACTIVEBACKUP:
|
||||||
return bond_xmit_activebackup(skb, dev);
|
return bond_xmit_activebackup(skb, dev);
|
||||||
@@ -647,7 +647,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
return bond_3ad_xor_xmit(skb, dev);
|
return bond_3ad_xor_xmit(skb, dev);
|
||||||
case BOND_MODE_BROADCAST:
|
case BOND_MODE_BROADCAST:
|
||||||
return bond_xmit_broadcast(skb, dev);
|
return bond_xmit_broadcast(skb, dev);
|
||||||
@@ -5926,6 +6202,9 @@ static void bond_destructor(struct net_d
|
@@ -5937,6 +6213,9 @@ static void bond_destructor(struct net_d
|
||||||
if (bond->wq)
|
if (bond->wq)
|
||||||
destroy_workqueue(bond->wq);
|
destroy_workqueue(bond->wq);
|
||||||
|
|
||||||
@@ -657,7 +657,7 @@ Signed-off-by: Pavithra R <quic_pavir@quicinc.com>
|
|||||||
free_percpu(bond->rr_tx_counter);
|
free_percpu(bond->rr_tx_counter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6479,6 +6758,11 @@ int bond_create(struct net *net, const c
|
@@ -6490,6 +6769,11 @@ int bond_create(struct net *net, const c
|
||||||
|
|
||||||
bond_work_init_all(bond);
|
bond_work_init_all(bond);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user