3 files changed, 13 insertions, 23 deletions

diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index c308756c2f9d..6398e6e67493 100644
--- a/net/ieee80211/softmac/ieee80211softmac_module.c
+++ b/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -456,18 +456,13 @@ void
 ieee80211softmac_add_network_locked(struct ieee80211softmac_device *mac,
         struct ieee80211softmac_network *add_net)
 {
-        struct list_head *list_ptr;
-        struct ieee80211softmac_network *softmac_net = NULL;
+        struct ieee80211softmac_network *softmac_net;
 
-        list_for_each(list_ptr, &mac->network_list) {
-                softmac_net = list_entry(list_ptr, struct ieee80211softmac_network, list);
+        list_for_each_entry(softmac_net, &mac->network_list, list) {
                 if(!memcmp(softmac_net->bssid, add_net->bssid, ETH_ALEN))
-                        break;
-                else
-                        softmac_net = NULL;
+                        return;
         }
-        if(softmac_net == NULL)
-                list_add(&(add_net->list), &mac->network_list);
+        list_add(&(add_net->list), &mac->network_list);
 }
 
 /* Add a network to the list, with locking */
@@ -506,16 +501,13 @@ struct ieee80211softmac_network *
 ieee80211softmac_get_network_by_bssid_locked(struct ieee80211softmac_device *mac,
         u8 *bssid)
 {
-        struct list_head *list_ptr;
-        struct ieee80211softmac_network *softmac_net = NULL;
-        list_for_each(list_ptr, &mac->network_list) {
-                softmac_net = list_entry(list_ptr, struct ieee80211softmac_network, list);
+        struct ieee80211softmac_network *softmac_net;
+
+        list_for_each_entry(softmac_net, &mac->network_list, list) {
                 if(!memcmp(softmac_net->bssid, bssid, ETH_ALEN))
-                        break;
-                else
-                        softmac_net = NULL;
+                        return softmac_net;
         }
-        return softmac_net;
+        return NULL;
 }
 
 /* Get a network from the list by BSSID with locking */
@@ -537,11 +529,9 @@ struct ieee80211softmac_network *
 ieee80211softmac_get_network_by_essid_locked(struct ieee80211softmac_device *mac,
         struct ieee80211softmac_essid *essid)
 {
-        struct list_head *list_ptr;
-        struct ieee80211softmac_network *softmac_net = NULL;
+        struct ieee80211softmac_network *softmac_net;
 
-        list_for_each(list_ptr, &mac->network_list) {
-                softmac_net = list_entry(list_ptr, struct ieee80211softmac_network, list);
+        list_for_each_entry(softmac_net, &mac->network_list, list) {
                 if (softmac_net->essid.len == essid->len &&
                         !memcmp(softmac_net->essid.data, essid->data, essid->len))
                         return softmac_net;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 099a983797da..c094583386fd 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -853,7 +853,7 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs
         u32 priv_len, maj_stat;
         int pad, saved_len, remaining_len, offset;
 
-        rqstp->rq_sendfile_ok = 0;
+        rqstp->rq_splice_ok = 0;
 
         priv_len = svc_getnl(&buf->head[0]);
         if (rqstp->rq_deferred) {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index e673ef993904..55ea6df069de 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -814,7 +814,7 @@ svc_process(struct svc_rqst *rqstp)
         rqstp->rq_res.tail[0].iov_base = NULL;
         rqstp->rq_res.tail[0].iov_len = 0;
         /* Will be turned off only in gss privacy case: */
-        rqstp->rq_sendfile_ok = 1;
+        rqstp->rq_splice_ok = 1;
         /* tcp needs a space for the record length... */
         if (rqstp->rq_prot == IPPROTO_TCP)
                 svc_putnl(resv, 0);