Merge branch 'linus' into xen-64bit

[linux-2.6] / drivers / net / wireless / prism54 / islpci_dev.h

diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index 4e0182ce835bacecc067fcc871b859bb1f93e664..8e55a5fcffaedaa2e1d181ed6ec65cc62f3b639c 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -55,7 +55,7 @@ struct islpci_acl {
    enum { MAC_POLICY_OPEN=0, MAC_POLICY_ACCEPT=1, MAC_POLICY_REJECT=2 } policy;
    struct list_head mac_list;  /* a list of mac_entry */
    int size;   /* size of queue */
-   struct semaphore sem;   /* accessed in ioctls and trap_work */
+   struct mutex lock;   /* accessed in ioctls and trap_work */
 };
 
 struct islpci_membuf {
@@ -88,7 +88,7 @@ typedef struct {
 
        /* Take care of the wireless stats */
        struct work_struct stats_work;
-       struct semaphore stats_sem;
+       struct mutex stats_lock;
        /* remember when we last updated the stats */
        unsigned long stats_timestamp;
        /* The first is accessed under semaphore locking.
@@ -178,7 +178,7 @@ typedef struct {
        int wpa; /* WPA mode enabled */
        struct list_head bss_wpa_list;
        int num_bss_wpa;
-       struct semaphore wpa_sem;
+       struct mutex wpa_lock;
        u8 wpa_ie[MAX_WPA_IE_LEN];
        size_t wpa_ie_len;