diff --git a/[refs] b/[refs]
index 854961a90bdd..76178ade6e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 646e0827df85f1305eeebf2108e9daafeabe0e0d
+refs/heads/master: 3fc7bc8ea792b4c55f53fccb589749d05c31569c
diff --git a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
index 1571505b1a38..54aba4744438 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
+++ b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
@@ -675,7 +675,7 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,
 	}
       done:
 	if (ieee->set_security)
-		ieee->set_security(ieee->dev, &sec);
+		ieee->set_security(dev, &sec);
 
 	return ret;
 }