target/linux/s3c24xx/patches-2.6.26/1185-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch

   1 From 30385f05a2e5358e62e3c736bd501c9bbdc1c681 Mon Sep 17 00:00:00 2001
   2 From: Holger Freyther <zecke@openmoko.org>
   3 Date: Fri, 25 Jul 2008 23:06:16 +0100
   4 Subject: [PATCH] Subject: [PATCH] [a6k] Everyone calls SET_NET_DEV and hald needs that too,
   5  make it happy
   6       Call SET_NET_DEV to set a parent device. All other net drivers
   7       are doing this and hald needs a parent to add the network device.
   8
   9 ---
  10  .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
  11  drivers/sdio/function/wlan/ar6000/hif/hif.c        |    6 ++++++
  12  drivers/sdio/function/wlan/ar6000/include/hif.h    |    5 +++++
  13  3 files changed, 12 insertions(+), 0 deletions(-)
  14
  15 diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
  16 index a854c7c..dacc00a 100644
  17 --- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
  18 +++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
  19 @@ -830,6 +830,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
  20          sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
  21
  22      /* This runs the init function */
  23 +    SET_NETDEV_DEV(dev, HIFGetOSDevice(ar->arHifDevice));
  24      if (register_netdev(dev)) {
  25          AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
  26          ar6000_destroy(dev, 0);
  27 diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
  28 index f5a0986..3d6d792 100644
  29 --- a/drivers/sdio/function/wlan/ar6000/hif/hif.c
  30 +++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
  31 @@ -779,6 +779,12 @@ delHifDevice(SDDEVICE *handle)
  32      hifDevice[0].handle = NULL;
  33  }
  34
  35 +struct device*
  36 +HIFGetOSDevice(HIF_DEVICE *device)
  37 +{
  38 +    return &device->handle->Device.dev;
  39 +}
  40 +
  41  static void ResetAllCards(void)
  42  {
  43      UINT8       data;
  44 diff --git a/drivers/sdio/function/wlan/ar6000/include/hif.h b/drivers/sdio/function/wlan/ar6000/include/hif.h
  45 index f32388c..846a69f 100644
  46 --- a/drivers/sdio/function/wlan/ar6000/include/hif.h
  47 +++ b/drivers/sdio/function/wlan/ar6000/include/hif.h
  48 @@ -284,6 +284,11 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
  49                     void *config, A_UINT32 configLen);
  50
  51
  52 +struct device;
  53 +struct device*
  54 +HIFGetOSDevice(HIF_DEVICE *device);
  55 +
  56 +
  57  #ifdef __cplusplus
  58  }
  59  #endif
  60 --
  61 1.5.6.3
  62