From a6e6392eedbbb725416e37dbacc63d1f54293dc0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 10 Jun 2021 21:11:00 +0200 Subject: [PATCH] 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 Change-Id: I9383db108bf18a73e5cd838acf37917e82ba76c2 --- include/linux/usb/usbnet.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 0179419bb56d..a90e2a9dfdd3 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -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);