From 7addb4724db6fb1cdf02f5a04cbd296d9b53c26e Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@suse.de>
Date: Thu, 7 Feb 2013 17:29:03 +0100
Subject: [PATCH 2/3] Add a void* suse_kabi_padding placeholder to some USB
structures
Patch-mainline: Never, kabi
References: fate#312013
---
include/linux/usb.h | 2 ++
include/linux/usb/hcd.h | 2 ++
include/linux/usb/usbnet.h | 3 +++
3 files changed, 7 insertions(+)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1113,6 +1113,7 @@ struct usb_driver {
unsigned int supports_autosuspend:1;
unsigned int disable_hub_initiated_lpm:1;
unsigned int soft_unbind:1;
+ void *suse_kabi_padding;
};
#define to_usb_driver(d) container_of(d, struct usb_driver, drvwrap.driver)
@@ -1488,6 +1489,7 @@ struct urb {
usb_complete_t complete; /* (in) completion routine */
struct usb_iso_packet_descriptor iso_frame_desc[0];
/* (in) ISO ONLY */
+ void *suse_kabi_padding;
};
/* ----------------------------------------------------------------------- */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -208,6 +208,7 @@ struct usb_hcd {
* (ohci 32, uhci 1024, ehci 256/512/1024).
*/
+ void *suse_kabi_padding;
/* The HC driver's private data is stored at the end of
* this structure.
*/
@@ -396,6 +397,7 @@ struct hc_driver {
/* Call for power on/off the port if necessary */
int (*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
+ void *suse_kabi_padding;
};
static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -79,6 +79,8 @@ struct usbnet {
# define EVENT_RX_KILL 10
# define EVENT_LINK_CHANGE 11
# define EVENT_SET_RX_MODE 12
+
+ void *suse_kabi_padding;
};
static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -168,6 +170,7 @@ struct driver_info {
int out; /* tx endpoint */
unsigned long data; /* Misc driver specific data */
+ void *suse_kabi_padding;
};
/* Minidrivers are just drivers using the "usbnet" core as a powerful