Debian Codegraph @

patches/old/zd1211rw_inject-2.6.20-gentoo-r4.patch

raw
1 diff -ur linux-2.6.20-gentoo-r4/drivers/net/wireless/zd1211rw/zd_mac.c linux-2.6.20-gentoo-r4-inject/drivers/net/wireless/zd1211rw/zd_mac.c
2 --- linux-2.6.20-gentoo-r4/drivers/net/wireless/zd1211rw/zd_mac.c 2007-04-03 00:53:39.000000000 -0400
3 +++ linux-2.6.20-gentoo-r4-inject/drivers/net/wireless/zd1211rw/zd_mac.c 2007-04-03 00:50:05.000000000 -0400
4 @@ -202,7 +202,16 @@
5 goto disable_rx;
6
7 housekeeping_enable(mac);
8 +
9 + netif_carrier_on(netdev);
10 +
11 ieee80211softmac_start(netdev);
12 +
13 + if(!netif_queue_stopped(netdev))
14 + netif_start_queue(netdev);
15 + else
16 + netif_wake_queue(netdev);
17 +
18 return 0;
19 disable_rx:
20 zd_chip_disable_rx(chip);
21 @@ -929,6 +938,8 @@
22 u8 rt_rate;
23 u16 rt_channel;
24 u16 rt_chbitmask;
25 + u8 rt_antsignal;
26 + u8 rt_antnoise;
27 } __attribute__((packed));
28
29 static void fill_rt_header(void *buffer, struct zd_mac *mac,
30 @@ -942,7 +953,9 @@
31 hdr->rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr));
32 hdr->rt_hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
33 (1 << IEEE80211_RADIOTAP_CHANNEL) |
34 - (1 << IEEE80211_RADIOTAP_RATE));
35 + (1 << IEEE80211_RADIOTAP_RATE) |
36 + (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
37 + (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE));
38
39 hdr->rt_flags = 0;
40 if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))
41 @@ -956,6 +969,12 @@
42 hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |
43 ((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) ==
44 ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));
45 +
46 + hdr->rt_antsignal = status->signal_strength;
47 + if(status->frame_status & ZD_RX_OFDM)
48 + hdr->rt_antnoise = status->signal_strength - status->signal_quality_ofdm;
49 + else
50 + hdr->rt_antnoise = status->signal_strength - status->signal_quality_cck;
51 }
52
53 /* Returns 1 if the data packet is for us and 0 otherwise. */
54 @@ -1062,7 +1081,8 @@
55 const struct rx_status *status;
56
57 *pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));
58 - if (status->frame_status & ZD_RX_ERROR) {
59 + if (status->frame_status & ZD_RX_ERROR
60 + || status->frame_status & ~0x21) {
61 /* FIXME: update? */
62 return -EINVAL;
63 }
64 Only in linux-2.6.20-gentoo-r4-inject/include: config
65 diff -ur linux-2.6.20-gentoo-r4/net/ieee80211/ieee80211_tx.c linux-2.6.20-gentoo-r4-inject/net/ieee80211/ieee80211_tx.c
66 --- linux-2.6.20-gentoo-r4/net/ieee80211/ieee80211_tx.c 2007-04-03 00:53:44.000000000 -0400
67 +++ linux-2.6.20-gentoo-r4-inject/net/ieee80211/ieee80211_tx.c 2007-04-03 00:45:52.000000000 -0400
68 @@ -291,6 +291,24 @@
69 goto success;
70 }
71
72 + if(ieee->iw_mode == IW_MODE_MONITOR)
73 + {
74 + txb = ieee80211_alloc_txb(1, skb->len,
75 + ieee->tx_headroom, GFP_ATOMIC);
76 + if (unlikely(!txb)) {
77 + printk(KERN_WARNING "%s: Could not allocate TXB\n",
78 + ieee->dev->name);
79 + goto failed;
80 + }
81 +
82 + txb->encrypted = 0;
83 + txb->payload_size = skb->len;
84 + memcpy(skb_put(txb->fragments[0],skb->len), skb->data, skb->len);
85 +
86 + goto success;
87 + }
88 +
89 +
90 ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto);
91
92 crypt = ieee->crypt[ieee->tx_keyidx];
93 Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: .docproc.cmd
94 Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: .fixdep.cmd
95 Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: docproc
96 Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: fixdep
97 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .conf.o.cmd
98 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .kconfig_load.o.cmd
99 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .kxgettext.o.cmd
100 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .qconf.cmd
101 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .qconf.o.cmd
102 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .tmp_qtcheck
103 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .zconf.tab.o.cmd
104 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: conf
105 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: conf.o
106 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: kconfig_load.o
107 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: kxgettext.o
108 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: lex.zconf.c
109 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: lkc_defs.h
110 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: mconf
111 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf
112 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf.moc
113 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf.o
114 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.hash.c
115 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.tab.c
116 Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.tab.o