Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

5 files changed, 10 insertions, 6 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index c64996f8a27a..4c64be4f8765 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -696,6 +696,8 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
         if (len < 0)
                 return -EINVAL;
 
+        v.val = 0;
+
         switch(optname) {
         case SO_DEBUG:
                 v.val = sock_flag(sk, SOCK_DBG);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index bf73f6d561b7..33926831c648 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1390,6 +1390,8 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                                 list) {
                                 if (!netif_running(sdata->dev))
                                         continue;
+                                if (sdata->vif.type != NL80211_IFTYPE_AP)
+                                        continue;
                                 if (compare_ether_addr(sdata->dev->dev_addr,
                                                        hdr->addr2)) {
                                         dev_hold(sdata->dev);
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index 6a91a32a80c1..4aa888584d20 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -207,7 +207,6 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
                                 dev->name, err);
                 dev->stats.tx_aborted_errors++;
                 dev->stats.tx_errors++;
-                dev_kfree_skb(skb);
         } else {
                 dev->stats.tx_packets++;
                 dev->stats.tx_bytes += len;
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index bb3e67849b38..8ad2b5333881 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -553,7 +553,7 @@ static int pep_do_rcv(struct sock *sk, struct sk_buff *skb)
 {
         struct pep_sock *pn = pep_sk(sk);
         struct sock *sknode;
-        struct pnpipehdr *hdr = pnp_hdr(skb);
+        struct pnpipehdr *hdr;
         struct sockaddr_pn dst;
         int err = NET_RX_SUCCESS;
         u8 pipe_handle;
diff --git a/net/wimax/id-table.c b/net/wimax/id-table.c
index 5e685f7eda90..72273abfcb16 100644
--- a/net/wimax/id-table.c
+++ b/net/wimax/id-table.c
@@ -94,12 +94,13 @@ struct wimax_dev *wimax_dev_get_by_genl_info(
         list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) {
                 if (wimax_dev->net_dev->ifindex == ifindex) {
                         dev_hold(wimax_dev->net_dev);
-                        break;
+                        goto found;
                 }
         }
-        if (wimax_dev == NULL)
-                d_printf(1, NULL, "wimax: no devices found with ifindex %d\n",
-                         ifindex);
+        wimax_dev = NULL;
+        d_printf(1, NULL, "wimax: no devices found with ifindex %d\n",
+                 ifindex);
+found:
         spin_unlock(&wimax_id_table_lock);
         d_fnend(3, NULL, "(info %p ifindex %d) = %p\n",
                 info, ifindex, wimax_dev);