ANDROID: restore abi breakage in usbnet.h

Commit de658a195ee2 ("net: usb: cdc_ncm: don't spew notifications") that
showed up in 5.4.125 added some new fields to struct usbnet.  "Restore"
the abi by using our pre-allocated padding as this change needs to stay
in the kernel for a set of common devices that it fixes problems for.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9383db108bf18a73e5cd838acf37917e82ba76c2
This commit is contained in:
Greg Kroah-Hartman 2021-06-10 21:11:00 +02:00
commit a6e6392eed

View file

@ -85,10 +85,9 @@ struct usbnet {
# define EVENT_LINK_CHANGE 11
# define EVENT_SET_RX_MODE 12
# define EVENT_NO_IP_ALIGN 13
u32 rx_speed; /* in bps - NOT Mbps */
u32 tx_speed; /* in bps - NOT Mbps */
/* rx_speed and tx_speed are in bps - NOT Mbps */
ANDROID_KABI_USE2(1, u32 rx_speed, u32 tx_speed);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);