---

yaml --- r: 205643 b: refs/heads/master c: 2e04bb7 h: refs/heads/master i: 205641: 0badefc 205639: dbb8504 v: v3
git-mirror · Jun 18, 2010 · 7498163 · 7498163
1 parent 4b6fbb1
commit 7498163
Show file tree

Hide file tree

Showing 14 changed files with 1,768 additions and 831 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb3126e60ffc1b7658a6ff4f6874585098bf9887
+refs/heads/master: 2e04bb7b284198f26e129b03e03459a7045cb8b6
diff --git a/trunk/drivers/staging/cxt1e1/linux.c b/trunk/drivers/staging/cxt1e1/linux.c
@@ -318,6 +318,34 @@ chan_close (struct net_device * ndev)
 }
 
 
+#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
+
+/** Linux 2.4.18-19 **/
+STATIC int
+chan_ioctl (hdlc_device * hdlc, struct ifreq * ifr, int cmd)
+{
+    if (cmd == HDLCSCLOCK)
+    {
+        ifr->ifr_ifru.ifru_ivalue = LINE_DEFAULT;
+        return 0;
+    }
+    return -EINVAL;
+}
+#endif
+
+
+#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
+STATIC int
+chan_dev_ioctl (struct net_device * hdlc, struct ifreq * ifr, int cmd)
+{
+    if (cmd == HDLCSCLOCK)
+    {
+        ifr->ifr_ifru.ifru_ivalue = LINE_DEFAULT;
+        return 0;
+    }
+    return -EINVAL;
+}
+#else
 STATIC int
 chan_dev_ioctl (struct net_device * dev, struct ifreq * ifr, int cmd)
 {
@@ -331,6 +359,7 @@ chan_attach_noop (struct net_device * ndev, unsigned short foo_1, unsigned short
     return 0;                   /* our driver has nothing to do here, show's
                                  * over, go home */
 }
+#endif
 
 
 STATIC struct net_device_stats *
@@ -393,6 +422,16 @@ get_ci_by_dev (struct net_device * ndev)
 }
 
 
+#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
+STATIC int
+c4_linux_xmit (hdlc_device * hdlc, struct sk_buff * skb)
+{
+    int         rval;
+
+    rval = musycc_start_xmit (DEV_TO_PRIV (hdlc)->ci, DEV_TO_PRIV (hdlc)->channum, skb);
+    return -rval;
+}
+#else                           /* new */
 STATIC int
 c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev)
 {
@@ -406,6 +445,7 @@ c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev)
     rval = musycc_start_xmit (priv->ci, priv->channum, skb);
     return -rval;
 }
+#endif                          /* GENERIC_HDLC_VERSION */
 
 static const struct net_device_ops chan_ops = {
        .ndo_open       = chan_open,

diff --git a/trunk/drivers/staging/cxt1e1/pmcc4.h b/trunk/drivers/staging/cxt1e1/pmcc4.h
@@ -117,8 +117,6 @@ extern      "C"
 
 #include "pmcc4_private.h"
 
-char       *get_hdlc_name (hdlc_device *);
-
 /*
  * external interface
  */

diff --git a/trunk/drivers/staging/winbond/phy_calibration.c b/trunk/drivers/staging/winbond/phy_calibration.c
@@ -32,7 +32,7 @@ static const s32 Angles[] = {
     FIXED(DEG2RAD(0.111906)), FIXED(DEG2RAD(0.055953)), FIXED(DEG2RAD(0.027977))
 };
 
-/****************** LOCAL FUNCTION DECLARATION SECTION **********************
+/****************** LOCAL FUNCTION DECLARATION SECTION **********************/
 
 /*
  * void    _phy_rf_write_delay(struct hw_data *phw_data);
@@ -142,7 +142,6 @@ u32 _s32_to_s6(s32 data)
         data = 31;
     else if (data < -32)
         data = -32;
-    }
 
     val = data & 0x003F;
 
@@ -1496,7 +1495,7 @@ void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency)
 /******************/
 void phy_set_rf_data(struct hw_data *pHwData, u32 index, u32 value)
 {
-   u32 ltmpi = 0;
+   u32 ltmp = 0;
 
     switch (pHwData->phy_type) {
     case RF_MAXIM_2825:

diff --git a/trunk/drivers/staging/wlan-ng/Makefile b/trunk/drivers/staging/wlan-ng/Makefile
@@ -4,4 +4,5 @@ prism2_usb-objs := prism2usb.o \
 		p80211conv.o \
 		p80211req.o \
 		p80211wep.o \
+		p80211wext.o \
 		p80211netdev.o
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,8 +117,6 @@ extern "C" @@
     #include "pmcc4_private.h"
-    char       *get_hdlc_name (hdlc_device *);
     /*
      * external interface
      */
@@ Expand Down @@