shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tipc: add tipc_bearer_min_mtu to calculate min mtu"

Browse Source 
This reverts commit 735c64ea88.

It breaks the Android KABI and will be brought back at a later time when
it is safe to do so.

Bug: 161946584
Change-Id: Ibf930d1b18dfb99cf889795d60ab410599434dd7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-06-13 18:44:40 +00:00
parent d71d75e074
commit bfd5fc9a7e
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/tipc/bearer.c
View File

@@ -541,19 +541,6 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id)
return mtu; return mtu;
} }
int tipc_bearer_min_mtu(struct net *net, u32 bearer_id)
{
int mtu = TIPC_MIN_BEARER_MTU;
struct tipc_bearer *b;
rcu_read_lock();
b = bearer_get(net, bearer_id);
if (b)
mtu += b->encap_hlen;
rcu_read_unlock();
return mtu;
}
/* tipc_bearer_xmit_skb - sends buffer to destination over bearer /* tipc_bearer_xmit_skb - sends buffer to destination over bearer
*/ */
void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id, void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id,

3
net/tipc/bearer.h
View File

@@ -146,7 +146,6 @@ struct tipc_media {
* @identity: array index of this bearer within TIPC bearer array * @identity: array index of this bearer within TIPC bearer array
* @disc: ptr to link setup request * @disc: ptr to link setup request
* @net_plane: network plane ('A' through 'H') currently associated with bearer * @net_plane: network plane ('A' through 'H') currently associated with bearer
* @encap_hlen: encap headers length
* @up: bearer up flag (bit 0) * @up: bearer up flag (bit 0)
* @refcnt: tipc_bearer reference counter * @refcnt: tipc_bearer reference counter
* *
@@ -171,7 +170,6 @@ struct tipc_bearer {
u32 identity; u32 identity;
struct tipc_discoverer *disc; struct tipc_discoverer *disc;
char net_plane; char net_plane;
u16 encap_hlen;
unsigned long up; unsigned long up;
refcount_t refcnt; refcount_t refcnt;
}; };
@@ -234,7 +232,6 @@ int tipc_bearer_setup(void);
void tipc_bearer_cleanup(void); void tipc_bearer_cleanup(void);
void tipc_bearer_stop(struct net *net); void tipc_bearer_stop(struct net *net);
int tipc_bearer_mtu(struct net *net, u32 bearer_id); int tipc_bearer_mtu(struct net *net, u32 bearer_id);
int tipc_bearer_min_mtu(struct net *net, u32 bearer_id);
bool tipc_bearer_bcast_support(struct net *net, u32 bearer_id); bool tipc_bearer_bcast_support(struct net *net, u32 bearer_id);
void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id, void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id,
struct sk_buff *skb, struct sk_buff *skb,

5
net/tipc/udp_media.c
View File

@@ -738,8 +738,8 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
udp_conf.local_ip.s_addr = local.ipv4.s_addr; udp_conf.local_ip.s_addr = local.ipv4.s_addr;
udp_conf.use_udp_checksums = false; udp_conf.use_udp_checksums = false;
ub->ifindex = dev->ifindex; ub->ifindex = dev->ifindex;
b->encap_hlen = sizeof(struct iphdr) + sizeof(struct udphdr); if (tipc_mtu_bad(dev, sizeof(struct iphdr) +
if (tipc_mtu_bad(dev, b->encap_hlen)) { sizeof(struct udphdr))) {
err = -EINVAL; err = -EINVAL;
goto err; goto err;
} }
@@ -760,7 +760,6 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
else else
udp_conf.local_ip6 = local.ipv6; udp_conf.local_ip6 = local.ipv6;
ub->ifindex = dev->ifindex; ub->ifindex = dev->ifindex;
b->encap_hlen = sizeof(struct ipv6hdr) + sizeof(struct udphdr);
b->mtu = 1280; b->mtu = 1280;
#endif #endif
} else { } else {