Skip to content

Commit

Permalink
qualcommax: refresh patches
Browse files Browse the repository at this point in the history
  • Loading branch information
tiffany-929 committed Sep 9, 2024
1 parent d24c76b commit 0da5f5e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

static const struct flow_dissector_key flow_keys_bonding_keys[] = {
{
@@ -5864,6 +5865,11 @@ static void bond_destructor(struct net_d
@@ -5911,6 +5912,11 @@ static void bond_destructor(struct net_d
if (bond->wq)
destroy_workqueue(bond->wq);

Expand All @@ -20,7 +20,7 @@
free_percpu(bond->rr_tx_counter);
}

@@ -6413,6 +6419,13 @@ int bond_create(struct net *net, const c
@@ -6464,6 +6470,13 @@ int bond_create(struct net *net, const c

bond_work_init_all(bond);

Expand All @@ -37,7 +37,7 @@
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -261,6 +261,7 @@ struct bonding {
spinlock_t ipsec_lock;
struct mutex ipsec_lock;
#endif /* CONFIG_XFRM_OFFLOAD */
struct bpf_prog *xdp_prog;
+ u32 id;/* QCA NSS ECM bonding support */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
/**
* bond_dev_queue_xmit - Prepare skb for xmit.
*
@@ -1181,6 +1196,23 @@ void bond_change_active_slave(struct bon
@@ -1228,6 +1243,23 @@ void bond_change_active_slave(struct bon
if (BOND_MODE(bond) == BOND_MODE_8023AD)
bond_3ad_handle_link_change(new_active, BOND_LINK_UP);

Expand All @@ -251,15 +251,15 @@
if (bond_is_lb(bond))
bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
} else {
@@ -1825,6 +1857,7 @@ int bond_enslave(struct net_device *bond
@@ -1872,6 +1904,7 @@ int bond_enslave(struct net_device *bond
const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
struct slave *new_slave = NULL, *prev_slave;
struct sockaddr_storage ss;
+ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */
int link_reporting;
int res = 0, i;

@@ -2270,6 +2303,15 @@ int bond_enslave(struct net_device *bond
@@ -2317,6 +2350,15 @@ int bond_enslave(struct net_device *bond
bond_is_active_slave(new_slave) ? "an active" : "a backup",
new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");

Expand All @@ -275,7 +275,7 @@
/* enslave is successful */
bond_queue_slave_event(new_slave);
return 0;
@@ -2335,6 +2377,15 @@ err_undo_flags:
@@ -2382,6 +2424,15 @@ err_undo_flags:
}
}

Expand All @@ -291,15 +291,15 @@
return res;
}

@@ -2356,6 +2407,7 @@ static int __bond_release_one(struct net
@@ -2403,6 +2454,7 @@ static int __bond_release_one(struct net
struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave, *oldcurrent;
struct sockaddr_storage ss;
+ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */
int old_flags = bond_dev->flags;
netdev_features_t old_features = bond_dev->features;

@@ -2378,6 +2430,15 @@ static int __bond_release_one(struct net
@@ -2425,6 +2477,15 @@ static int __bond_release_one(struct net

bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);

Expand All @@ -315,7 +315,7 @@
bond_sysfs_slave_del(slave);

/* recompute stats just before removing the slave */
@@ -2700,6 +2761,8 @@ static void bond_miimon_commit(struct bo
@@ -2747,6 +2808,8 @@ static void bond_miimon_commit(struct bo
struct slave *slave, *primary, *active;
bool do_failover = false;
struct list_head *iter;
Expand All @@ -324,7 +324,7 @@

ASSERT_RTNL();

@@ -2739,6 +2802,12 @@ static void bond_miimon_commit(struct bo
@@ -2786,6 +2849,12 @@ static void bond_miimon_commit(struct bo
bond_set_active_slave(slave);
}

Expand All @@ -337,7 +337,7 @@
slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n",
slave->speed == SPEED_UNKNOWN ? 0 : slave->speed,
slave->duplex ? "full" : "half");
@@ -2787,6 +2856,16 @@ static void bond_miimon_commit(struct bo
@@ -2834,6 +2903,16 @@ static void bond_miimon_commit(struct bo
unblock_netpoll_tx();
}

Expand All @@ -354,7 +354,7 @@
bond_set_carrier(bond);
}

@@ -4039,8 +4118,219 @@ static inline u32 bond_eth_hash(struct s
@@ -4086,8 +4165,219 @@ static inline u32 bond_eth_hash(struct s
return 0;

ep = (struct ethhdr *)(data + mhoff);
Expand Down Expand Up @@ -575,7 +575,7 @@

static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void *data,
int hlen, __be16 l2_proto, int *nhoff, int *ip_proto, bool l34)
@@ -5169,15 +5459,18 @@ static netdev_tx_t bond_3ad_xor_xmit(str
@@ -5216,15 +5506,18 @@ static netdev_tx_t bond_3ad_xor_xmit(str
struct net_device *dev)
{
struct bonding *bond = netdev_priv(dev);
Expand All @@ -601,7 +601,7 @@
}

/* in broadcast mode, we send everything to all usable interfaces. */
@@ -5427,8 +5720,9 @@ static netdev_tx_t __bond_start_xmit(str
@@ -5474,8 +5767,9 @@ static netdev_tx_t __bond_start_xmit(str
return bond_xmit_roundrobin(skb, dev);
case BOND_MODE_ACTIVEBACKUP:
return bond_xmit_activebackup(skb, dev);
Expand Down

0 comments on commit 0da5f5e

Please sign in to comment.