Skip to contentSkip to conversation

orinoco: Don't use "extern inline" on locking functions

PATCH New Pavel Roskin 1 participant 2 messages Aug 16, 2006

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Pavel Roskin

author
#0 lore raw

PATCH 1/2 orinoco: Don't use "extern inline" on locking functions

From: Pavel Roskin <[email protected]>

SPARC architecture has been fixed, so it's no longer needed.

Signed-off-by Pavel Roskin <[email protected]>

---

 drivers/net/wireless/orinoco.h |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/orinoco.h +2 -6
index 16db3e1..fb5700d 100644
@@ -134,11 +134,7 @@ extern irqreturn_t orinoco_interrupt(int
 /* Locking and synchronization functions                            */
 /********************************************************************/
 
-/* These functions *must* be inline or they will break horribly on
- * SPARC, due to its weird semantics for save/restore flags. extern
- * inline should prevent the kernel from linking or module from
- * loading if they are not inlined. */
-extern inline int orinoco_lock(struct orinoco_private *priv,
+static inline int orinoco_lock(struct orinoco_private *priv,
 			       unsigned long *flags)
 {
 	spin_lock_irqsave(&priv->lock, *flags);

@@ -151,7 +147,7 @@ extern inline int orinoco_lock(struct or
 	return 0;
 }
 
-extern inline void orinoco_unlock(struct orinoco_private *priv,
+static inline void orinoco_unlock(struct orinoco_private *priv,
 				  unsigned long *flags)
 {
 	spin_unlock_irqrestore(&priv->lock, *flags);
author
#1 lore raw

PATCH 2/2 Don't rely on linux/if_arp.h being included by other headers

From: Pavel Roskin <[email protected]>

---

 drivers/net/wireless/orinoco.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/wireless/orinoco.c +1 -0
index 317ace7..1174ff5 100644
@@ -82,6 +82,7 @@ #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/if_arp.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>