mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 16:46:15 -04:00
Merge android11-5.4.61+ (3a3ba4b) into msm-5.4
* refs/heads/tmp-3a3ba4b UPSTREAM: udp: initialize is_flist with 0 in udp_gro_receive UPSTREAM: udp: Support UDP fraglist GRO/GSO. UPSTREAM: net: Support GRO/GSO fraglist chaining. UPSTREAM: net: Add a netdev software feature set that defaults to off. BACKPORT: net: Add fraglist GRO/GSO feature flags Revert "BACKPORT: net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()" ANDROID: vendor_hooks: Add vendor hooks for key combination Change-Id: If5fd73581f5038b9f82be74a19c2deef8aaa1e4a Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
This commit is contained in:
commit
23326187cd
12 changed files with 1026 additions and 653 deletions
|
|
@ -167,7 +167,7 @@ typedef struct sock *(*udp_lookup_t)(struct sk_buff *skb, __be16 sport,
|
|||
__be16 dport);
|
||||
|
||||
struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,
|
||||
struct udphdr *uh, udp_lookup_t lookup);
|
||||
struct udphdr *uh, struct sock *sk);
|
||||
int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup);
|
||||
|
||||
struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
|
||||
|
|
|
|||
Loading…
Reference in a new issue