Commit 006d1fc4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by William McVicker
Browse files

ANDROID: always add the struct wireless_dev * to struct net_device



When Android moved the wifi drivers to be a vendor driver, it disabled
CFG80211 from the build configuration, yet that needs to be enabled in
the vendor module build.  As the struct net_device is defined in the
core kernel image, both builds needs to have the same structure size, so
always enable it in the structure and protect any potential vendor
changes from showing up in the CRC checker by maing it a void * as far
as it is concerned.

Also update the kernel abi definition to resolve this:

function symbol 'int ___pskb_trim(struct sk_buff*, unsigned int)' changed
  CRC changed from 0x3d8e01bc to 0x6c6bbe0a

function symbol 'struct sk_buff* __alloc_skb(unsigned int, gfp_t, int, int)' changed
  CRC changed from 0x35a57bd5 to 0xd9823116

function symbol 'int __dev_change_net_namespace(struct net_device*, struct net*, const char*, int)' changed
  CRC changed from 0x8bc2389e to 0x1c3133b9

... 823 omitted; 826 symbols have only CRC changes

type 'struct net_device' changed
  member 'struct wireless_dev* ieee80211_ptr' was added
  17 members ('struct wpan_dev* ieee802154_ptr' .. 'struct hlist_node index_hlist') changed
    offset changed by 64

Fixes: c304eddc ("net: wrap the wireless pointers in struct net_device in an ifdef")
Change-Id: I7c2a10da63b6022abbac78a3a0d48c2fd405f42c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent eea2369f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment