* [PATCH 4/6] [DCCP]: Fix the adjustments to AWL and SWL
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-4-git-send-email-gerrit@erg.abdn.ac.uk>
This fixes a problem and a potential loophole with regard to seqno/ackno
validity: the problem is that the initial adjustments to AWL/SWL were
only performed at the begin of the connection, during the handshake.
Since the Sequence Window feature is always greater than Wmin=32 (7.5.2),
it is however necessary to perform these adjustments at least for the first
W/W' (variables as per 7.5.1) packets in the lifetime of a connection.
This requirement is complicated by the fact that W/W' can change at any time
during the lifetime of a connection.
Therefore the consequence is to perform this safety check each time SWL/AWL
are updated.
A second problem solved by this patch is that the remote/local Sequence Window
feature values (which set the bounds for AWL/SWL/SWH) are undefined until the
feature negotiation has completed.
During the initial handshake we have more stringent sequence number protection,
the changes added by this patch effect that {A,S}W{L,H} are within the correct
bounds at the instant that feature negotiation completes (since the SeqWin
feature activation handlers call dccp_update_gsr/gss()).
A detailed rationale is below -- can be removed from the commit message.
1. Server sequence number checks during initial handshake
---------------------------------------------------------
The server can not use the fields of the listening socket for seqno/ackno checks
and thus needs to store all relevant information on a per-connection basis on
the dccp_request socket. This is a size-constrained structure and has currently
only ISS (dreq_iss) and ISR (dreq_isr) defined.
Adding further fields (SW{L,H}, AW{L,H}) would increase the size of the struct
and it is questionable whether this will have any practical gain. The currently
implemented solution is as follows.
* receiving first Request: dccp_v{4,6}_conn_request sets
ISR := P.seqno, ISS := dccp_v{4,6}_init_sequence()
* sending first Response: dccp_v{4,6}_send_response via dccp_make_response()
sets P.seqno := ISS, sets P.ackno := ISR
* receiving retransmitted Request: dccp_check_req() overrides ISR := P.seqno
* answering retransmitted Request: dccp_make_response() sets ISS += 1,
otherwise as per first Response
* completing the handshake: succeeds in dccp_check_req() for the first Ack
where P.ackno == ISS (P.seqno is not tested)
* creating child socket: ISS, ISR are copied from the request_sock
This solution will succeed whenever the server can receive the Request and the
subsequent Ack in succession, without retransmissions. If there is packet loss,
the client needs to retransmit until this condition succeeds; it will otherwise
eventually give up. Adding further fields to the request_sock could increase
the robustness a bit, in that it would make possible to let a reordered Ack
(from a retransmitted Response) pass. The argument against such a solution is
that if the packet loss is not persistent and an Ack gets through, why not
wait for the one answering the original response: if the loss is persistent, it
is probably better to not start the connection in the first place.
Long story short: the present design (by Arnaldo) is simple and will likely work
just as well as a more complicated solution. As a consequence, {A,S}W{L,H} are
not needed until the moment the request_sock is cloned into the accept queue.
At that stage feature negotiation has completed, so that the values for the local
and remote Sequence Window feature (7.5.2) are known, i.e. we are now in a better
position to compute {A,S}W{L,H}.
2. Client sequence number checks during initial handshake
---------------------------------------------------------
Until entering PARTOPEN the client does not need the adjustments, since it
constrains the Ack window to the packet it sent.
* sending first Request: dccp_v{4,6}_connect() choose ISS,
dccp_connect() then sets GAR := ISS (as per 8.5),
dccp_transmit_skb() (with the previous bug fix) sets
GSS := ISS, AWL := ISS, AWH := GSS
* n-th retransmitted Request (with previous patch):
dccp_retransmit_skb() via timer calls
dccp_transmit_skb(), which sets GSS := ISS+n
and then AWL := ISS, AWH := ISS+n
* receiving any Response: dccp_rcv_request_sent_state_process()
-- accepts packet if AWL <= P.ackno <= AWH;
-- sets GSR = ISR = P.seqno
* sending the Ack completing the handshake: dccp_send_ack() calls
dccp_transmit_skb(), which sets GSS += 1
and AWL := ISS, AWH := GSS
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/dccp.h | 20 ++++++++++++++++++++
net/dccp/input.c | 18 ++++++------------
net/dccp/minisocks.c | 30 +++++++++---------------------
3 files changed, 35 insertions(+), 33 deletions(-)
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -392,6 +392,23 @@ static inline void dccp_update_gsr(struct sock *sk, u64 seq)
dp->dccps_gsr = seq;
/* Sequence validity window depends on remote Sequence Window (7.5.1) */
dp->dccps_swl = SUB48(ADD48(dp->dccps_gsr, 1), dp->dccps_r_seq_win / 4);
+ /*
+ * Adjust SWL so that it is not below ISR. In contrast to RFC 4340,
+ * 7.5.1 we perform this check beyond the initial handshake: W/W' are
+ * always > 32, so for the first W/W' packets in the lifetime of a
+ * connection we always have to adjust SWL.
+ * A second reason why we are doing this is that the window depends on
+ * the feature-remote value of Sequence Window: nothing stops the peer
+ * from updating this value while we are busy adjusting SWL for the
+ * first W packets (we would have to count from scratch again then).
+ * Therefore it is safer to always make sure that the Sequence Window
+ * is not artificially extended by a peer who grows SWL downwards by
+ * continually updating the feature-remote Sequence-Window.
+ * If sequence numbers wrap it is bad luck. But that will take a while
+ * (48 bit), and this measure prevents Sequence-number attacks.
+ */
+ if (before48(dp->dccps_swl, dp->dccps_isr))
+ dp->dccps_swl = dp->dccps_isr;
dp->dccps_swh = ADD48(dp->dccps_gsr, (3 * dp->dccps_r_seq_win) / 4);
}
@@ -402,6 +419,9 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq)
dp->dccps_gss = seq;
/* Ack validity window depends on local Sequence Window value (7.5.1) */
dp->dccps_awl = SUB48(ADD48(dp->dccps_gss, 1), dp->dccps_l_seq_win);
+ /* Adjust AWL so that it is not below ISS - see comment above for SWL */
+ if (before48(dp->dccps_awl, dp->dccps_iss))
+ dp->dccps_awl = dp->dccps_iss;
dp->dccps_awh = dp->dccps_gss;
}
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -440,20 +440,14 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
dp->dccps_syn_rtt = dccp_sample_rtt(sk, 10 * (tstamp -
dp->dccps_options_received.dccpor_timestamp_echo));
- dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq;
- dccp_update_gsr(sk, dp->dccps_isr);
/*
- * SWL and AWL are initially adjusted so that they are not less than
- * the initial Sequence Numbers received and sent, respectively:
- * SWL := max(GSR + 1 - floor(W/4), ISR),
- * AWL := max(GSS - W' + 1, ISS).
- * These adjustments MUST be applied only at the beginning of the
- * connection.
- *
- * AWL was adjusted in dccp_v4_connect -acme
+ * Set ISR, GSR from packet. ISS was set in dccp_v{4,6}_connect
+ * and GSS in dccp_transmit_skb(). Setting AWL/AWH and SWL/SWH
+ * is done as part of activating the feature values below, since
+ * these settings depend on the local/remote Sequence Window
+ * features, which were undefined or not confirmed until now.
*/
- dccp_set_seqno(&dp->dccps_swl,
- max48(dp->dccps_swl, dp->dccps_isr));
+ dp->dccps_gsr = dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq;
dccp_sync_mss(sk, icsk->icsk_pmtu_cookie);
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -120,30 +120,18 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
*
* Choose S.ISS (initial seqno) or set from Init Cookies
* Initialize S.GAR := S.ISS
- * Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies
- */
- newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
- dccp_update_gss(newsk, dreq->dreq_iss);
-
- newdp->dccps_isr = dreq->dreq_isr;
- dccp_update_gsr(newsk, dreq->dreq_isr);
-
- /*
- * SWL and AWL are initially adjusted so that they are not less than
- * the initial Sequence Numbers received and sent, respectively:
- * SWL := max(GSR + 1 - floor(W/4), ISR),
- * AWL := max(GSS - W' + 1, ISS).
- * These adjustments MUST be applied only at the beginning of the
- * connection.
+ * Set S.ISR, S.GSR from packet (or Init Cookies)
+ *
+ * Setting AWL/AWH and SWL/SWH happens as part of the feature
+ * activation below, as these windows all depend on the local
+ * and remote Sequence Window feature values (7.5.2).
*/
- dccp_set_seqno(&newdp->dccps_swl,
- max48(newdp->dccps_swl, newdp->dccps_isr));
- dccp_set_seqno(&newdp->dccps_awl,
- max48(newdp->dccps_awl, newdp->dccps_iss));
+ newdp->dccps_gss = newdp->dccps_iss = dreq->dreq_iss;
+ newdp->dccps_gar = newdp->dccps_iss;
+ newdp->dccps_gsr = newdp->dccps_isr = dreq->dreq_isr;
/*
- * Activate features after initialising the sequence numbers since
- * CCID initialisation may depend on GSS, ISR, ISS etc.
+ * Activate features: initialise CCIDs, sequence windows etc.
*/
if (dccp_feat_activate_values(newsk, &dreq->dreq_featneg)) {
/* It is still raw copy of parent, so invalidate
^ permalink raw reply
* [PATCH 6/6] [DCCP-PROBE]: Reduce noise in output and convert to ktime_t
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-6-git-send-email-gerrit@erg.abdn.ac.uk>
This fixes the problem that dccp_probe output can grow quite large without
apparent benefit (many identical data points), creating huge files (up to
over one Gigabyte for a few minutes' test run) which are very hard to
post-process (in one instance it got so bad that gnuplot ate up all memory
plus swap).
The cause for the problem is that the kprobe is inserted into dccp_sendmsg,
which can be called in a polling-mode (whenever the TX queue is full due to
congestion-control issues, EAGAIN is returned). This creates many very
similar data points, i.e. the increase of processing time does not increase
the quality/information of the probe output.
The fix is to attach the probe to a different function -- write_xmit was
chosen since it gets called continually (both via userspace and timer);
an input-path function would stop sampling as soon as the other end stops
sending feedback.
For comparison the output file sizes for the same 20 second test
run over a lossy link:
* before / without patch: 118 Megabytes
* after / with patch: 1.2 Megabytes
and there was much less noise in the output.
To allow backward compatibility with scripts that people use, the now-unused
`size' field in the output has been replaced with the CCID identifier. This
also serves for future compatibility - support for CCID2 is work in progress
(depends on the still unfinished SRTT/RTTVAR updates).
While at it, the update to ktime_t was also performed.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/probe.c | 68 ++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 45 deletions(-)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -46,77 +46,55 @@ struct {
struct kfifo *fifo;
spinlock_t lock;
wait_queue_head_t wait;
- struct timeval tstart;
+ ktime_t start;
} dccpw;
-static void printl(const char *fmt, ...)
-{
- va_list args;
- int len;
- struct timeval now;
- char tbuf[256];
-
- va_start(args, fmt);
- do_gettimeofday(&now);
-
- now.tv_sec -= dccpw.tstart.tv_sec;
- now.tv_usec -= dccpw.tstart.tv_usec;
- if (now.tv_usec < 0) {
- --now.tv_sec;
- now.tv_usec += 1000000;
- }
-
- len = sprintf(tbuf, "%lu.%06lu ",
- (unsigned long) now.tv_sec,
- (unsigned long) now.tv_usec);
- len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);
- va_end(args);
-
- kfifo_put(dccpw.fifo, tbuf, len);
- wake_up(&dccpw.wait);
-}
-
-static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
- struct msghdr *msg, size_t size)
+static void jdccp_write_xmit(struct sock *sk)
{
const struct inet_sock *inet = inet_sk(sk);
struct ccid3_hc_tx_sock *hctx = NULL;
+ struct timespec tv;
+ char tbuf[256];
+ int len, ccid = ccid_get_current_id(dccp_sk(sk), false);
- if (ccid_get_current_id(dccp_sk(sk), false) == DCCPC_CCID3)
+ if (ccid == DCCPC_CCID3)
hctx = ccid3_hc_tx_sk(sk);
- if (port == 0 || ntohs(inet->dport) == port ||
- ntohs(inet->sport) == port) {
- if (hctx)
- printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
- "%llu %llu %d\n",
+ if (!port || ntohs(inet->dport) == port || ntohs(inet->sport) == port) {
+
+ tv = ktime_to_timespec(ktime_sub(ktime_get(), dccpw.start));
+ len = sprintf(tbuf, "%lu.%09lu %d.%d.%d.%d:%u %d.%d.%d.%d:%u %d",
+ (unsigned long) tv.tv_sec,
+ (unsigned long) tv.tv_nsec,
NIPQUAD(inet->saddr), ntohs(inet->sport),
- NIPQUAD(inet->daddr), ntohs(inet->dport), size,
+ NIPQUAD(inet->daddr), ntohs(inet->dport), ccid);
+
+ if (hctx)
+ len += sprintf(tbuf + len, " %d %d %d %u %llu %llu %d",
hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
hctx->ccid3hctx_x_recv >> 6,
hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
- else
- printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
- NIPQUAD(inet->saddr), ntohs(inet->sport),
- NIPQUAD(inet->daddr), ntohs(inet->dport), size);
+
+ len += sprintf(tbuf + len, "\n");
+ kfifo_put(dccpw.fifo, tbuf, len);
+ wake_up(&dccpw.wait);
}
jprobe_return();
- return 0;
}
static struct jprobe dccp_send_probe = {
.kp = {
- .symbol_name = "dccp_sendmsg",
+ .symbol_name = "dccp_write_xmit",
},
- .entry = jdccp_sendmsg,
+ .entry = jdccp_write_xmit,
};
static int dccpprobe_open(struct inode *inode, struct file *file)
{
kfifo_reset(dccpw.fifo);
- do_gettimeofday(&dccpw.tstart);
+ dccpw.start = ktime_get();
return 0;
}
^ permalink raw reply
* [PATCH 5/6] [DCCP]: Merge now-reduced connect_init() function
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-5-git-send-email-gerrit@erg.abdn.ac.uk>
After moving the assignment of GAR/ISS from dccp_connect_init() to
dccp_transmit_skb(), the former function becomes very small, so that
a merger with dccp_connect() suggested itself.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/output.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -444,8 +444,9 @@ int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)
/*
* Do all connect socket setups that can be done AF independent.
*/
-static inline void dccp_connect_init(struct sock *sk)
+int dccp_connect(struct sock *sk)
{
+ struct sk_buff *skb;
struct dccp_sock *dp = dccp_sk(sk);
struct dst_entry *dst = __sk_dst_get(sk);
struct inet_connection_sock *icsk = inet_csk(sk);
@@ -455,22 +456,12 @@ static inline void dccp_connect_init(struct sock *sk)
dccp_sync_mss(sk, dst_mtu(dst));
- /* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */
- dp->dccps_gar = dp->dccps_iss;
-
- icsk->icsk_retransmits = 0;
-}
-
-int dccp_connect(struct sock *sk)
-{
- struct sk_buff *skb;
- struct inet_connection_sock *icsk = inet_csk(sk);
-
/* do not connect if feature negotiation setup fails */
if (dccp_feat_finalise_settings(dccp_sk(sk)))
return -EPROTO;
- dccp_connect_init(sk);
+ /* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */
+ dp->dccps_gar = dp->dccps_iss;
skb = alloc_skb(sk->sk_prot->max_header, sk->sk_allocation);
if (unlikely(skb == NULL))
@@ -486,6 +477,7 @@ int dccp_connect(struct sock *sk)
DCCP_INC_STATS(DCCP_MIB_ACTIVEOPENS);
/* Timer for repeating the REQUEST until an answer. */
+ icsk->icsk_retransmits = 0;
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
icsk->icsk_rto, DCCP_RTO_MAX);
return 0;
^ permalink raw reply
* [PATCH 3/6] [DCCP]: Bug-Fix - AWL was never updated
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-3-git-send-email-gerrit@erg.abdn.ac.uk>
This patch was triggered by finding the following message in the syslog:
"kernel: dccp_check_seqno: DCCP: Step 6 failed for DATAACK packet, [...]
P.ackno exists or LAWL(82947089) <= P.ackno(82948208)
<= S.AWH(82948728), sending SYNC..."
Note the difference between AWH and AWL: it is 1639 packets (while Sequence
Window was actually at 100). A closer look at the trace showed that
LAWL = AWL = 82947089 equalled the ISS on the Response.
The cause of the bug was that AWL was only ever set on the first packet - the
DCCP-Request sent by dccp_v{4,6}_connect().
The fix is to continually update AWL/AWH with each new packet (as GSS=AWH).
In addition, AWL/AWH are now updated to enforce more stringent checks on the
initial sequence numbers when connecting:
* AWL is initialised to ISS and remains at this value;
* AWH is always set to GSS (via dccp_update_gss());
* so on the first Request: AWL = AWH = ISS,
and on the n-th Request: AWL = ISS, AWH = ISS+n.
As a consequence, only Response packets that refer to Requests sent by this
host will pass, all others are discarded. This is the intention and in effect
implements the initial adjustments for AWL as specified in RFC 4340, 7.5.1.
Note: A problem that remains is that ISS can potentially be under-run even after
the initial handshake; this is addressed a subsequent patch.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/output.c | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -53,8 +53,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
dccp_packet_hdr_len(dcb->dccpd_type);
int err, set_ack = 1;
u64 ackno = dp->dccps_gsr;
-
- dccp_inc_seqno(&dp->dccps_gss);
+ /*
+ * Increment GSS here already in case the option code needs it.
+ * Update GSS for real only if option processing below succeeds.
+ */
+ dcb->dccpd_seq = ADD48(dp->dccps_gss, 1);
switch (dcb->dccpd_type) {
case DCCP_PKT_DATA:
@@ -66,6 +69,9 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
case DCCP_PKT_REQUEST:
set_ack = 0;
+ /* Use ISS on the first (non-retransmitted) Request. */
+ if (icsk->icsk_retransmits == 0)
+ dcb->dccpd_seq = dp->dccps_iss;
/* fall through */
case DCCP_PKT_SYNC:
@@ -84,14 +90,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
break;
}
- dcb->dccpd_seq = dp->dccps_gss;
-
if (dccp_insert_options(sk, skb)) {
kfree_skb(skb);
return -EPROTO;
}
-
/* Build DCCP header and checksum it. */
dh = dccp_zeroed_hdr(skb, dccp_header_size);
dh->dccph_type = dcb->dccpd_type;
@@ -103,7 +106,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
/* XXX For now we're using only 48 bits sequence numbers */
dh->dccph_x = 1;
- dp->dccps_awh = dp->dccps_gss;
+ dccp_update_gss(sk, dcb->dccpd_seq);
dccp_hdr_set_seq(dh, dp->dccps_gss);
if (set_ack)
dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), ackno);
@@ -112,6 +115,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
case DCCP_PKT_REQUEST:
dccp_hdr_request(skb)->dccph_req_service =
dp->dccps_service;
+ /*
+ * Limit Ack window to ISS <= P.ackno <= GSS, so that
+ * only Responses to Requests we sent are considered.
+ */
+ dp->dccps_awl = dp->dccps_iss;
break;
case DCCP_PKT_RESET:
dccp_hdr_reset(skb)->dccph_reset_code =
@@ -447,19 +455,7 @@ static inline void dccp_connect_init(struct sock *sk)
dccp_sync_mss(sk, dst_mtu(dst));
- /*
- * SWL and AWL are initially adjusted so that they are not less than
- * the initial Sequence Numbers received and sent, respectively:
- * SWL := max(GSR + 1 - floor(W/4), ISR),
- * AWL := max(GSS - W' + 1, ISS).
- * These adjustments MUST be applied only at the beginning of the
- * connection.
- */
- dccp_update_gss(sk, dp->dccps_iss);
- dccp_set_seqno(&dp->dccps_awl, max48(dp->dccps_awl, dp->dccps_iss));
-
- /* S.GAR - greatest valid acknowledgement number received on a non-Sync;
- * initialized to S.ISS (sec. 8.5) */
+ /* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */
dp->dccps_gar = dp->dccps_iss;
icsk->icsk_retransmits = 0;
^ permalink raw reply
* [PATCH 1/6] [CCID3]: Function returned wrong value
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-1-git-send-email-gerrit@erg.abdn.ac.uk>
This fixes a bug in the reverse lookup of p, given a value f(p) (used in the
reverse-lookup of the first/synthetic loss interval in RFC 3448, 6.3.1):
instead of p, the function returned the smallest table value f(p).
The smallest tabulated value of
10^6 * f(p) = sqrt(2*p/3) + 12 * sqrt(3*p/8) * (32 * p^3 + p)
for p=0.0001 is 8172.
Since this value is scaled by 10^6, the impact of this bug is that a loss
of 8172/10^6 = 0.8172% was reported whenever the input was below the table
resolution of 0.01%.
This means that the value was over 80 times too high, resulting in large spikes
of the initial loss interval, and thus unnecessarily reducing the throughput.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/ccids/lib/tfrc_equation.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -677,11 +677,11 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue)
/* Error cases. */
if (fvalue < tfrc_calc_x_lookup[0][1]) {
DCCP_WARN("fvalue %d smaller than resolution\n", fvalue);
- return tfrc_calc_x_lookup[0][1];
+ return TFRC_SMALLEST_P;
}
if (fvalue > tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) {
DCCP_WARN("fvalue %d exceeds bounds!\n", fvalue);
- return 1000000;
+ return 1000000; /* The maximum: 100% scaled by 10^6 */
}
if (fvalue <= tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][1]) {
^ permalink raw reply
* [DCCP] [Patch 0/6] [BUG-Fix]: Fixes for CCID3, seqnos, and dccp_probe
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev
This is a set of bug fixes for CCID3 and general DCCP.
Please consider patches #1, #2, #3. The remainder are for the test tree
(but are fixes nonetheless) and may not apply directly onto mainline; with
regard to patch #6, please see note at end of message.
Patch #1: Fixes a CCID3 bug: when loss was encountered, the value returned at
minimum resolution was wrong and over 80 times too high.
Patch #2: Fixes a bug in the assignment of GAR (used ISR instead of ISS).
Patch #3: Another bug fix: AWL was only ever set after the Response.
Patch #4: Fixes adjustments to AWL and SWL. These were only updated at the
begin of the connection (where the statements reduced to much
simpler assignments), but need to be adjusted for the reception
of subsequent packets also.
(Note: This patch is best used after going through the feature
negotiation patches, since the feature handlers for Sequence
Window ensure that these values are up to date.)
Patch #5: As a consequence of the preceding patches, the dccp_connect_init
function may be merged into dccp_connect. Is a suggestion (which
would make sense), not a bug fix.
Patch #6: A fix for dccp_probe - this used to be noisy and created huge
files. By attaching the dccp_probe onto a different function, this
was fixed, the output file size shrank by a factor of over 100,
with qualitatively the same or better output.
I have put these after the feature-negotiation patches onto
git://eden-feed.erg.abdn.ac.uk/dccp_exp {dccp,ccid4}
and updated the CCID4 tree to take advantage of the dccp_probe update.
If people would like to use the dccp_probe update for a mainline kernel,
I have uploaded a similar patch to patch #6 onto
http://www.erg.abdn.ac.uk/users/gerrit/dccp/dccp_probe_for_mainline.diff
^ permalink raw reply
* [PATCH 2/6] [DCCP]: Bug in initial acknowledgment number assignment
From: Gerrit Renker @ 2008-01-28 10:16 UTC (permalink / raw)
To: acme; +Cc: dccp, netdev, Gerrit Renker
In-Reply-To: <1201515376-8280-2-git-send-email-gerrit@erg.abdn.ac.uk>
Step 8.5 in RFC 4340 says for the newly cloned socket
Initialize S.GAR := S.ISS,
but what in fact the code (minisocks.c) does is
Initialize S.GAR := S.ISR,
which is wrong (typo?) -- fixed by the patch.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/minisocks.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -122,13 +122,12 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
* Initialize S.GAR := S.ISS
* Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies
*/
+ newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
+ dccp_update_gss(newsk, dreq->dreq_iss);
- newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr;
+ newdp->dccps_isr = dreq->dreq_isr;
dccp_update_gsr(newsk, dreq->dreq_isr);
- newdp->dccps_iss = dreq->dreq_iss;
- dccp_update_gss(newsk, dreq->dreq_iss);
-
/*
* SWL and AWL are initially adjusted so that they are not less than
* the initial Sequence Numbers received and sent, respectively:
^ permalink raw reply
* 2.6.24 regression: Wake On Lan in sky2 broken on Mac mini
From: Tino Keitel @ 2008-01-28 8:42 UTC (permalink / raw)
To: netdev
Hi folks,
with 2.6.24-rc8, Wake On LAN doesn't work anymore as it used to with
2.6.23 on my Mac mini Core Duo. I saw that this was reported in
http://bugzilla.kernel.org/show_bug.cgi?id=9721 and on netdev a patch
for the sky2 driver was sent by Stephen Hemminger. This patch fixed WOL
for me after applying it to 2.6.24-rc8.
However, it seems as the patch never made it into the kernel. Instead,
the commit that was suspected to break WOL
(84cd2dfb04d23a961c5f537baa243fa54d0987ac) was reverted
(be63a21c9573fbf88106ff0f030da5974551257b).
Now I tried the 2.6.24 release and noticed that WOL is still broken.
I'll be happy to test any patches that can make it into 2.6.24.1.
Regards,
Tino
^ permalink raw reply
* Re: [PATCHv2 2.6.24] fib: fix route replacement, fib_info is shared
From: Jarek Poplawski @ 2008-01-28 8:56 UTC (permalink / raw)
To: Julian Anastasov; +Cc: David S. Miller, netdev, Joonwoo Park
In-Reply-To: <20080128083302.GA2115@ff.dom.local>
On Mon, Jan 28, 2008 at 09:33:02AM +0100, Jarek Poplawski wrote:
...
> [...] Are these aliases in the node sorted by
> fib_priority too? [...]
OK, I see they are!
Sorry for bothering,
Jarek P.
^ permalink raw reply
* Re: 2.6.24 regression: Wake On Lan in sky2 broken on Mac mini
From: Tino Keitel @ 2008-01-28 8:48 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev
In-Reply-To: <18333.37002.749771.524523@harpo.it.uu.se>
On Mon, Jan 28, 2008 at 09:21:30 +0100, Mikael Pettersson wrote:
> Tino Keitel writes:
> > Hi folks,
> >
> > with 2.6.24-rc8, Wake On LAN doesn't work anymore as it used to with
> > 2.6.23 on my Mac mini Core Duo. I saw that this was reported in
> > http://bugzilla.kernel.org/show_bug.cgi?id=9721 and on netdev a patch
> > for the sky2 driver was sent by Stephen Hemminger. This patch fixed WOL
> > for me after applying it to 2.6.24-rc8.
> >
> > However, it seems as the patch never made it into the kernel. Instead,
> > the commit that was suspected to break WOL
> > (84cd2dfb04d23a961c5f537baa243fa54d0987ac) was reverted
> > (be63a21c9573fbf88106ff0f030da5974551257b).
> >
> > Now I tried the 2.6.24 release and noticed that WOL is still broken.
> > I'll be happy to test any patches that can make it into 2.6.24.1.
>
> 1. Wrong mailing list; use netdev (@vger) instead.
Done.
> 2. The reverted commit had much much more serious consequences than
> "wol doesn't work", it actually caused BIOS hangs and failed reboots.
Yes, but even with the reverted commit, WOL still doesn't work. I just
tried the patch from the netdev mailing list with the 2.6.24 release
version and now WOL works for me.
Regards,
Tino
^ permalink raw reply
* Re: [PATCHv2 2.6.24] fib: fix route replacement, fib_info is shared
From: Jarek Poplawski @ 2008-01-28 8:36 UTC (permalink / raw)
To: Julian Anastasov; +Cc: David S. Miller, netdev, Joonwoo Park
In-Reply-To: <20080128083302.GA2115@ff.dom.local>
On Mon, Jan 28, 2008 at 09:33:02AM +0100, Jarek Poplawski wrote:
...
> from fib_node_alias() with right tos but greater fib_priority, but
"from fib_find_alias()" of course...
arek P.
^ permalink raw reply
* Re: [PATCHv2 2.6.24] fib: fix route replacement, fib_info is shared
From: Jarek Poplawski @ 2008-01-28 8:33 UTC (permalink / raw)
To: Julian Anastasov; +Cc: David S. Miller, netdev, Joonwoo Park
In-Reply-To: <20080127232018.GA2856@ami.dom.local>
On 28-01-2008 00:20, Jarek Poplawski wrote:
> Hi, I have a few questions below:
>
> Julian Anastasov wrote, On 01/26/2008 01:41 PM:
...
>> --- linux-2.6.24/net/ipv4/fib_hash.c_orig 2008-01-25 10:45:06.000000000 +0200
>> +++ linux-2.6.24/net/ipv4/fib_hash.c 2008-01-26 14:11:34.000000000 +0200
>> @@ -434,19 +434,43 @@ static int fn_hash_insert(struct fib_tab
>>
>> if (fa && fa->fa_tos == tos &&
>> fa->fa_info->fib_priority == fi->fib_priority) {
...One more doubt here. Your FIB description doesn't say about this,
and a code at the end of this function, where a new alias is inserted,
doesn't seem to show this too. Are these aliases in the node sorted by
fib_priority too? I mean, isn't it possible here, that we got fa
from fib_node_alias() with right tos but greater fib_priority, but
there is a better match (with right priority) later on the list yet?
(The comment above this reads something else, but I'd be glad if you
could confirm this.)
Regards,
Jarek P.
^ permalink raw reply
* Re: [PATCH 12/14 v2] [rndis_host] Add RNDIS physical medium checking into generic_rndis_bind()
From: David Brownell @ 2008-01-28 6:49 UTC (permalink / raw)
To: Jussi Kivilinna
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, bjd-a1rhEgazXTw
In-Reply-To: <20080127213358.7278.32005.stgit-q/85JClnwdg@public.gmane.org>
On Sunday 27 January 2008, Jussi Kivilinna wrote:
> Add RNDIS physical medium checking into generic_rndis_bind() and also make
> rndis_host to be only bind on every medium except wireless.
>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna-E01nCVcF24I@public.gmane.org>
Acked-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
I think that means the whole series is fair to merge into
the network drivers queue, assuming nobody has any issues
with the last patch (adding the actual rndis_wlan support).
Thanks for doing this ... it's nice to see folk successfully
building on top of this rndis_host code, since it started
without any "real" RNDIS devices to test against! (Just the
Linux-USB "g_ether" peripheral code.)
- Dave
> ---
>
> drivers/net/usb/rndis_host.c | 36 +++++++++++++++++++++++++++++++++---
> drivers/net/usb/rndis_host.h | 19 ++++++++++++++++++-
> 2 files changed, 51 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
> index 800c9d0..0606e11 100644
> --- a/drivers/net/usb/rndis_host.c
> +++ b/drivers/net/usb/rndis_host.c
> @@ -271,7 +271,8 @@ response_error:
> return -EDOM;
> }
>
> -int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
> +int
> +generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
> {
> int retval;
> struct net_device *net = dev->net;
> @@ -287,7 +288,7 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
> struct rndis_set_c *set_c;
> struct rndis_halt *halt;
> } u;
> - u32 tmp;
> + u32 tmp, *phym;
> int reply_len;
> unsigned char *bp;
>
> @@ -358,6 +359,30 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
> dev->driver_info->early_init(dev) != 0)
> goto halt_fail_and_release;
>
> + /* Check physical medium */
> + reply_len = sizeof *phym;
> + retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
> + 0, (void **) &phym, &reply_len);
> + if (retval != 0)
> + /* OID is optional so don't fail here. */
> + *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
> + if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
> + *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
> + if (netif_msg_probe(dev))
> + dev_dbg(&intf->dev, "driver requires wireless "
> + "physical medium, but device is not.\n");
> + retval = -ENODEV;
> + goto halt_fail_and_release;
> + }
> + if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&
> + *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
> + if (netif_msg_probe(dev))
> + dev_dbg(&intf->dev, "driver requires non-wireless "
> + "physical medium, but device is wireless.\n");
> + retval = -ENODEV;
> + goto halt_fail_and_release;
> + }
> +
> /* Get designated host ethernet address */
> reply_len = ETH_ALEN;
> retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
> @@ -403,6 +428,11 @@ fail:
> }
> EXPORT_SYMBOL_GPL(generic_rndis_bind);
>
> +static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
> +{
> + return generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_NOT_WIRELESS);
> +}
> +
> void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
> {
> struct rndis_halt *halt;
> @@ -518,7 +548,7 @@ EXPORT_SYMBOL_GPL(rndis_tx_fixup);
> static const struct driver_info rndis_info = {
> .description = "RNDIS device",
> .flags = FLAG_ETHER | FLAG_FRAMING_RN | FLAG_NO_SETINT,
> - .bind = generic_rndis_bind,
> + .bind = rndis_bind,
> .unbind = rndis_unbind,
> .status = rndis_status,
> .rx_fixup = rndis_rx_fixup,
> diff --git a/drivers/net/usb/rndis_host.h b/drivers/net/usb/rndis_host.h
> index 61f1fd8..edc1d4a 100644
> --- a/drivers/net/usb/rndis_host.h
> +++ b/drivers/net/usb/rndis_host.h
> @@ -82,6 +82,17 @@ struct rndis_msg_hdr {
> #define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b)
> #define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c)
>
> +/* codes for OID_GEN_PHYSICAL_MEDIUM */
> +#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED ccpu2(0x00000000)
> +#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN ccpu2(0x00000001)
> +#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM ccpu2(0x00000002)
> +#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE ccpu2(0x00000003)
> +#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE ccpu2(0x00000004)
> +#define RNDIS_PHYSICAL_MEDIUM_DSL ccpu2(0x00000005)
> +#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL ccpu2(0x00000006)
> +#define RNDIS_PHYSICAL_MEDIUM_1394 ccpu2(0x00000007)
> +#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN ccpu2(0x00000008)
> +#define RNDIS_PHYSICAL_MEDIUM_MAX ccpu2(0x00000009)
>
> struct rndis_data_hdr {
> __le32 msg_type; /* RNDIS_MSG_PACKET */
> @@ -222,6 +233,7 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
> #define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
> #define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106)
> #define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e)
> +#define OID_GEN_PHYSICAL_MEDIUM ccpu2(0x00010202)
>
> /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
> #define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001)
> @@ -244,10 +256,15 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
> RNDIS_PACKET_TYPE_ALL_MULTICAST | \
> RNDIS_PACKET_TYPE_PROMISCUOUS)
>
> +/* Flags to require specific physical medium type for generic_rndis_bind() */
> +#define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001
> +#define FLAG_RNDIS_PHYM_WIRELESS 0x0002
> +
>
> extern void rndis_status(struct usbnet *dev, struct urb *urb);
> extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
> -extern int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf);
> +extern int
> +generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
> extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
> extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb);
> extern struct sk_buff *
>
^ permalink raw reply
* [PATCH][INET_DIAG]: Fix inet_diag_lock_handler error path
From: Arnaldo Carvalho de Melo @ 2008-01-28 2:20 UTC (permalink / raw)
To: David S. Miller; +Cc: Herbert Xu, spike, netdev, stable
Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=9825
The inet_diag_lock_handler function uses ERR_PTR to encode errors but
its callers were testing against NULL.
This only happens when the only inet_diag modular user, DCCP, is not
built into the kernel or available as a module.
Also there was a problem with not dropping the mutex lock when a handler
was not found, also fixed in this patch.
This caused an OOPS and ss would then hang on subsequent calls, as
&inet_diag_table_mutex was being left locked.
Thanks to spike at ml.yaroslavl.ru for report it after trying 'ss -d'
on a kernel that doesn't have DCCP available.
This bug was introduced in cset
d523a328fb0271e1a763e985a21f2488fd816e7e, after 2.6.24-rc3, so just
2.6.24 seems to be affected.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index e468e7a..6d2979c 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -259,8 +259,10 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
const struct inet_diag_handler *handler;
handler = inet_diag_lock_handler(nlh->nlmsg_type);
- if (!handler)
- return -ENOENT;
+ if (IS_ERR(handler)) {
+ err = PTR_ERR(handler);
+ goto unlock;
+ }
hashinfo = handler->idiag_hashinfo;
err = -EINVAL;
@@ -708,8 +710,8 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
struct inet_hashinfo *hashinfo;
handler = inet_diag_lock_handler(cb->nlh->nlmsg_type);
- if (!handler)
- goto no_handler;
+ if (IS_ERR(handler))
+ goto unlock;
hashinfo = handler->idiag_hashinfo;
@@ -838,7 +840,6 @@ done:
cb->args[2] = num;
unlock:
inet_diag_unlock_handler(handler);
-no_handler:
return skb->len;
}
^ permalink raw reply related
* Re: [PATCH] TCP:Fix a bug in strategy_allowed_congestion_control
From: shanwei @ 2008-01-28 2:05 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: davem, netdev, Sam Jansen
In-Reply-To: <20080125082553.78e1d207@deepthought>
Stephen Hemminger 写道:
> On Fri, 25 Jan 2008 15:10:13 +0800
> shanwei <shanwei@cn.fujitsu.com> wrote:
>
>> hi all:
>>
>> In strategy_allowed_congestion_control of the 2.6.24 kernel,
>> when sysctl_string return 1 on success,it should call
>> tcp_set_allowed_congestion_control to set the allowed congestion
>> control.But, it don't.
>> the sysctl_string return 1 on success, otherwise return negative,
>> never return 0.The patch fix the problem.
>>
>> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
>>
>> diff -Nuarp linux-2.6.24/net/ipv4/sysctl_net_ipv4.c linux-2.6.24-new/net/ipv4/sysctl_net_ipv4.c
>> --- linux-2.6.24/net/ipv4/sysctl_net_ipv4.c 2008-01-25 06:58:37.000000000 +0800
>> +++ linux-2.6.24-new/net/ipv4/sysctl_net_ipv4.c 2008-01-25 12:23:20.000000000 +0800
>> @@ -248,7 +248,7 @@ static int strategy_allowed_congestion_c
>>
>> tcp_get_available_congestion_control(tbl.data, tbl.maxlen);
>> ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen);
>> - if (ret == 0 && newval && newlen)
>> + if (ret == 1 && newval && newlen)
>> ret = tcp_set_allowed_congestion_control(tbl.data);
>> kfree(tbl.data);
>>
>>
>
> Acked-by: Stephen Hemminger <shemminger@vyatta.com>
>
> This parallels previous fix by Sam Jansen.
>
>
From the link:http://marc.info/?l=linux-netdev&m=119551836927062&w=2,
he only fix the sysctl_tcp_congestion_control function.
In the latest kernel, the sysctl_string problem is present.
Can this patch be applied?
^ permalink raw reply
* [PATCH] Implement skb_partial_csum_set
From: Rusty Russell @ 2008-01-27 22:58 UTC (permalink / raw)
To: Linus Torvalds; +Cc: netdev
Implement skb_partial_csum_set, for setting partial csums on untrusted packets.
Use it in virtio_net (replacing buggy version there), it's also going
to be used by TAP for partial csum support.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: David S. Miller <davem@davemloft.net>
---
drivers/net/virtio_net.c | 11 +----------
include/linux/skbuff.h | 1 +
net/core/skbuff.c | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+), 10 deletions(-)
diff -r 72be3d596d31 include/linux/skbuff.h
--- a/include/linux/skbuff.h Wed Jan 09 15:57:40 2008 +1100
+++ b/include/linux/skbuff.h Wed Jan 09 16:56:41 2008 +1100
@@ -1804,5 +1804,6 @@ static inline void skb_forward_csum(stru
skb->ip_summed = CHECKSUM_NONE;
}
+bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
diff -r 72be3d596d31 net/core/skbuff.c
--- a/net/core/skbuff.c Wed Jan 09 15:57:40 2008 +1100
+++ b/net/core/skbuff.c Wed Jan 09 16:56:41 2008 +1100
@@ -2214,6 +2214,34 @@ int skb_cow_data(struct sk_buff *skb, in
return elt;
}
+/**
+ * skb_partial_csum_set - set up and verify partial csum values for packet
+ * @skb: the skb to set
+ * @start: the number of bytes after skb->data to start checksumming.
+ * @off: the offset from start to place the checksum.
+ *
+ * For untrusted partially-checksummed packets, we need to make sure the values
+ * for skb->csum_start and skb->csum_offset are valid so we don't oops.
+ *
+ * This function checks and sets those values and skb->ip_summed: if this
+ * returns false you should drop the packet.
+ */
+bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)
+{
+ if (unlikely(start > skb->len - 2) ||
+ unlikely((int)start + off > skb->len - 2)) {
+ if (net_ratelimit())
+ printk(KERN_WARNING
+ "bad partial csum: csum=%u/%u len=%u\n",
+ start, off, skb->len);
+ return false;
+ }
+ skb->ip_summed = CHECKSUM_PARTIAL;
+ skb->csum_start = skb_headroom(skb) + start;
+ skb->csum_offset = off;
+ return true;
+}
+
EXPORT_SYMBOL(___pskb_trim);
EXPORT_SYMBOL(__kfree_skb);
EXPORT_SYMBOL(kfree_skb);
@@ -2250,3 +2278,4 @@ EXPORT_SYMBOL(skb_append_datato_frags);
EXPORT_SYMBOL_GPL(skb_to_sgvec);
EXPORT_SYMBOL_GPL(skb_cow_data);
+EXPORT_SYMBOL_GPL(skb_partial_csum_set);
diff -r 72be3d596d31 drivers/net/virtio_net.c
--- a/drivers/net/virtio_net.c Wed Jan 09 15:57:40 2008 +1100
+++ b/drivers/net/virtio_net.c Wed Jan 09 16:56:41 2008 +1100
@@ -89,17 +89,8 @@ static void receive_skb(struct net_devic
if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
pr_debug("Needs csum!\n");
- skb->ip_summed = CHECKSUM_PARTIAL;
- skb->csum_start = hdr->csum_start;
- skb->csum_offset = hdr->csum_offset;
- if (skb->csum_start > skb->len - 2
- || skb->csum_offset > skb->len - 2) {
- if (net_ratelimit())
- printk(KERN_WARNING "%s: csum=%u/%u len=%u\n",
- dev->name, skb->csum_start,
- skb->csum_offset, skb->len);
+ if (!skb_partial_csum_set(skb,hdr->csum_start,hdr->csum_offset))
goto frame_err;
- }
}
if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
^ permalink raw reply
* [PATCH] SCTP: Fix miss of report unrecognized HMAC Algorithm parameter
From: Wei Yongjun @ 2008-01-27 23:50 UTC (permalink / raw)
To: netdev; +Cc: lksctp-developers, David Miller
In-Reply-To: <479A1422.3090304@hp.com>
This patch fix miss of check for report unrecognized HMAC Algorithm
parameter.
When AUTH is disabled, goto fall through path to report unrecognized
parameter, else, just break.
> Wei
>
> Neil Horman wrote:
>> On Wed, Jan 23, 2008 at 09:30:27AM +0900, Wei Yongjun wrote:
>>> This patch fix miss of check for report unrecognized HMAC Algorithm
>>> parameter.
>>> When AUTH is disabled, goto fall through path to report unrecognized
>>> parameter, else, just break.
>>>
>>>
>>
>> Acked-by: Neil Horman <nhorman@tuxdriver.com>
>>
>> Neil
>>
>
> Can you please send this to netdev and CC Dave Miller..
>
> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
>
> -vlad
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
--- a/net/sctp/sm_make_chunk.c 2008-01-21 00:03:25.000000000 -0500
+++ b/net/sctp/sm_make_chunk.c 2008-01-21 02:33:36.000000000 -0500
@@ -2014,7 +2014,7 @@ static sctp_ierror_t sctp_verify_param(c
break;
case SCTP_PARAM_HMAC_ALGO:
- if (!sctp_auth_enable)
+ if (sctp_auth_enable)
break;
/* Fall Through */
fallthrough:
^ permalink raw reply
* Re: [PATCHv2 2.6.24] fib: fix route replacement, fib_info is shared
From: Jarek Poplawski @ 2008-01-27 23:20 UTC (permalink / raw)
To: Julian Anastasov; +Cc: David S. Miller, netdev, Joonwoo Park
In-Reply-To: <Pine.LNX.4.58.0801261439020.7864@u.domain.uli>
Hi, I have a few questions below:
Julian Anastasov wrote, On 01/26/2008 01:41 PM:
> fib_info can be shared by many route prefixes but we don't
> want duplicate alternative routes for a prefix+tos+priority. Last
> change was not correct to check fib_treeref because it accounts usage
> from other prefixes. Additionally, avoid replacement without error
> if new route is same, as Joonwoo Park suggests.
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> ---
>
> --- linux-2.6.24/net/ipv4/fib_hash.c_orig 2008-01-25 10:45:06.000000000 +0200
> +++ linux-2.6.24/net/ipv4/fib_hash.c 2008-01-26 14:11:34.000000000 +0200
> @@ -434,19 +434,43 @@ static int fn_hash_insert(struct fib_tab
>
> if (fa && fa->fa_tos == tos &&
> fa->fa_info->fib_priority == fi->fib_priority) {
> - struct fib_alias *fa_orig;
> + struct fib_alias *fa_first, *fa_match;
>
> err = -EEXIST;
> if (cfg->fc_nlflags & NLM_F_EXCL)
> goto out;
BTW, the way "add" works wasn't questioned now, but it seems could be,
or man ip should call it e.g. "ip route add - add new destination",
and append "ip route append" (unless I have old man).
>
> + /* We have 2 goals:
> + * 1. Find exact match for type, scope, fib_info to avoid
> + * duplicate routes
> + * 2. Find next 'fa' (or head), NLM_F_APPEND inserts before it
> + */
> + fa_match = NULL;
> + fa_first = fa;
> + fa = list_entry(fa->fa_list.prev, struct fib_alias, fa_list);
> + list_for_each_entry_continue(fa, &f->fn_alias, fa_list) {
> + if (fa->fa_tos != tos)
> + break;
> + if (fa->fa_info->fib_priority != fi->fib_priority)
> + break;
> + if (fa->fa_type == cfg->fc_type &&
> + fa->fa_scope == cfg->fc_scope &&
> + fa->fa_info == fi) {
> + fa_match = fa;
> + break;
Why can't we try goto out from here? (less reading...)
> + }
> + }
> +
> if (cfg->fc_nlflags & NLM_F_REPLACE) {
> struct fib_info *fi_drop;
> u8 state;
>
> - if (fi->fib_treeref > 1)
> + fa = fa_first;
> + if (fa_match) {
> + if (fa == fa_match)
> + err = 0;
Could you comment more why returning an error seems to depend on the
order of aliases here? But, IMHO there is no reason to change the old
behavior WRT this error, so probably this err = 0 should be always if
NLM_F_REPLACE is set.
> goto out;
> -
> + }
> write_lock_bh(&fib_hash_lock);
> fi_drop = fa->fa_info;
> fa->fa_info = fi;
> @@ -469,20 +493,11 @@ static int fn_hash_insert(struct fib_tab
> * uses the same scope, type, and nexthop
> * information.
> */
> - fa_orig = fa;
> - fa = list_entry(fa->fa_list.prev, struct fib_alias, fa_list);
> - list_for_each_entry_continue(fa, &f->fn_alias, fa_list) {
> - if (fa->fa_tos != tos)
> - break;
> - if (fa->fa_info->fib_priority != fi->fib_priority)
> - break;
> - if (fa->fa_type == cfg->fc_type &&
> - fa->fa_scope == cfg->fc_scope &&
> - fa->fa_info == fi)
> - goto out;
> - }
> + if (fa_match)
> + goto out;
> +
> if (!(cfg->fc_nlflags & NLM_F_APPEND))
> - fa = fa_orig;
> + fa = fa_first;
> }
>
> err = -ENOENT;
Generally this patch looks OK to me.
Thanks,
Jarek P.
PS: I think, this FIB info you sent earlier is just fine for
Documentation/networking without any changes! (Maybe one more patch?)
^ permalink raw reply
* [PATCH 12/14 v2] [rndis_host] Add RNDIS physical medium checking into generic_rndis_bind()
From: Jussi Kivilinna @ 2008-01-27 21:34 UTC (permalink / raw)
To: linux-wireless-u79uwXL29TY76Z2rM5mHXA
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, david-b-yBeKhBN/0LDR7s880joybQ,
bjd-a1rhEgazXTw
Add RNDIS physical medium checking into generic_rndis_bind() and also make
rndis_host to be only bind on every medium except wireless.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna-E01nCVcF24I@public.gmane.org>
---
drivers/net/usb/rndis_host.c | 36 +++++++++++++++++++++++++++++++++---
drivers/net/usb/rndis_host.h | 19 ++++++++++++++++++-
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 800c9d0..0606e11 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -271,7 +271,8 @@ response_error:
return -EDOM;
}
-int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
+int
+generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
{
int retval;
struct net_device *net = dev->net;
@@ -287,7 +288,7 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
struct rndis_set_c *set_c;
struct rndis_halt *halt;
} u;
- u32 tmp;
+ u32 tmp, *phym;
int reply_len;
unsigned char *bp;
@@ -358,6 +359,30 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
dev->driver_info->early_init(dev) != 0)
goto halt_fail_and_release;
+ /* Check physical medium */
+ reply_len = sizeof *phym;
+ retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
+ 0, (void **) &phym, &reply_len);
+ if (retval != 0)
+ /* OID is optional so don't fail here. */
+ *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+ if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
+ *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
+ if (netif_msg_probe(dev))
+ dev_dbg(&intf->dev, "driver requires wireless "
+ "physical medium, but device is not.\n");
+ retval = -ENODEV;
+ goto halt_fail_and_release;
+ }
+ if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&
+ *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
+ if (netif_msg_probe(dev))
+ dev_dbg(&intf->dev, "driver requires non-wireless "
+ "physical medium, but device is wireless.\n");
+ retval = -ENODEV;
+ goto halt_fail_and_release;
+ }
+
/* Get designated host ethernet address */
reply_len = ETH_ALEN;
retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
@@ -403,6 +428,11 @@ fail:
}
EXPORT_SYMBOL_GPL(generic_rndis_bind);
+static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ return generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_NOT_WIRELESS);
+}
+
void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
{
struct rndis_halt *halt;
@@ -518,7 +548,7 @@ EXPORT_SYMBOL_GPL(rndis_tx_fixup);
static const struct driver_info rndis_info = {
.description = "RNDIS device",
.flags = FLAG_ETHER | FLAG_FRAMING_RN | FLAG_NO_SETINT,
- .bind = generic_rndis_bind,
+ .bind = rndis_bind,
.unbind = rndis_unbind,
.status = rndis_status,
.rx_fixup = rndis_rx_fixup,
diff --git a/drivers/net/usb/rndis_host.h b/drivers/net/usb/rndis_host.h
index 61f1fd8..edc1d4a 100644
--- a/drivers/net/usb/rndis_host.h
+++ b/drivers/net/usb/rndis_host.h
@@ -82,6 +82,17 @@ struct rndis_msg_hdr {
#define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b)
#define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c)
+/* codes for OID_GEN_PHYSICAL_MEDIUM */
+#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED ccpu2(0x00000000)
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN ccpu2(0x00000001)
+#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM ccpu2(0x00000002)
+#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE ccpu2(0x00000003)
+#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE ccpu2(0x00000004)
+#define RNDIS_PHYSICAL_MEDIUM_DSL ccpu2(0x00000005)
+#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL ccpu2(0x00000006)
+#define RNDIS_PHYSICAL_MEDIUM_1394 ccpu2(0x00000007)
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN ccpu2(0x00000008)
+#define RNDIS_PHYSICAL_MEDIUM_MAX ccpu2(0x00000009)
struct rndis_data_hdr {
__le32 msg_type; /* RNDIS_MSG_PACKET */
@@ -222,6 +233,7 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
#define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
#define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106)
#define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e)
+#define OID_GEN_PHYSICAL_MEDIUM ccpu2(0x00010202)
/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
#define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001)
@@ -244,10 +256,15 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
RNDIS_PACKET_TYPE_ALL_MULTICAST | \
RNDIS_PACKET_TYPE_PROMISCUOUS)
+/* Flags to require specific physical medium type for generic_rndis_bind() */
+#define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001
+#define FLAG_RNDIS_PHYM_WIRELESS 0x0002
+
extern void rndis_status(struct usbnet *dev, struct urb *urb);
extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
-extern int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf);
+extern int
+generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb);
extern struct sk_buff *
^ permalink raw reply related
* Re: [PATCH 12/14] [rndis_host] Add RNDIS physical medium checking into generic_rndis_bind()
From: David Brownell @ 2008-01-27 19:51 UTC (permalink / raw)
To: Jussi Kivilinna
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, bjd-a1rhEgazXTw
In-Reply-To: <1201460746.3663.18.camel@localhost>
On Sunday 27 January 2008, Jussi Kivilinna wrote:
>
> I'm not very familiar with posting patches (as some might have noticed)
> so I have some questions.. if you don't mind. Now that you have acked
> most of the patches, is it ok for me to add your 'Acked-by' to those
> patches?
On those patches I've acked, yes. (Unless it's a different version
from what I acked...) You may not need to re-send them ... that's
kind of a policy choice of the subsystem maintainer (Jeff Garzik in
this case). Most maintainers pick up acks from the mailing list, as
part of their merge process.
> Should I even repost all of these patches as patchset or just
> ones that have been fixed?
Again, that's a subsystem-specific policy. In most cases I'm
familiar with, the answer is to avoid needless reposting ... so
after it's acked, at most one repost-with-ack. (And typically
not even that, when maintainers pick up the acks.)
The main reason to repost an entire patch series is to avoid
confusion that creeps in with too many tweaked versions. On
the other hand, such reposting creates its own confusion...
> Should I post new 'physical medium' patch as
> reply to this post and then repost patchset with your ack just to
> mailing list?
My two cents: just post an updated version of $SUBJECT.
If Jeff wants a version with the Acks, he'll tell you
(or someone more up on netdev policies will).
At this point, assuming you update $SUBJECT patch OK,
I think this series is ready for Jeff's attention...
- Dave
^ permalink raw reply
* Re: [PATCH 10/14] [rndis_host] Add early_init function pointer to 'struct rndis_data'.
From: Jussi Kivilinna @ 2008-01-27 19:11 UTC (permalink / raw)
To: David Brownell
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, bjd-a1rhEgazXTw
In-Reply-To: <200801270814.43760.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
On Sun, 2008-01-27 at 08:14 -0800, David Brownell wrote:
> On Friday 25 January 2008, Jussi Kivilinna wrote:
> > Function pointer is for 'subminidrivers' that need to do work on device
> > right after minidriver has initialized hardware.
> >
> > For example, rndis_wlan setting device specific configuration parameters
> > with OID_GEN_RNDIS_CONFIG_PARAMETER right after rndis_host has
> > initialized hardware with RNDIS_INIT.
> >
> > Signed-off-by: Jussi Kivilinna <jussi.kivilinna-E01nCVcF24I@public.gmane.org>
>
> Acked-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
>
> ... though I'm not sure I'd coin a term like "subminidriver". ;)
Hm.. sure there could have been better ways of explaining that but with
my inadequate english skills that's what came out first :)
^ permalink raw reply
* Re: [PATCH 12/14] [rndis_host] Add RNDIS physical medium checking into generic_rndis_bind()
From: Jussi Kivilinna @ 2008-01-27 19:05 UTC (permalink / raw)
To: David Brownell; +Cc: linux-wireless, netdev, bjd
In-Reply-To: <200801270829.53470.david-b@pacbell.net>
On Sun, 2008-01-27 at 08:29 -0800, David Brownell wrote:
> Well, other than the obvious checkpatch.pl warnings waiting to trigger
> ("if" is not a function; put a space before the paren) and what I'd call
> missing parens around the "flags & ...", those are *not* errors. No
> wonder you thought this would cause too many messages!!
Well, I guess I got lazy between patchsets.
> Just make those be dev_dbg() calls instead. The strongest message level
> you can argue for there would be KERN_NOTICE, "normal but significant";
> except it's not especially significant. Filtering by netif_msg_probe()
> may be a good idea too; that's normally enabled in this framework.
I'll use dev_dbg() with netif_msg_probe().
> p.s. Before these get submitted, *all* of them need to pass "checkpatch.pl".
> Ideally, "checkpatch.pl --strict" ...
Ok, I'll remember that now.
I'm not very familiar with posting patches (as some might have noticed)
so I have some questions.. if you don't mind. Now that you have acked
most of the patches, is it ok for me to add your 'Acked-by' to those
patches? Should I even repost all of these patches as patchset or just
ones that have been fixed? Should I post new 'physical medium' patch as
reply to this post and then repost patchset with your ack just to
mailing list?
- Jussi Kivilinna
^ permalink raw reply
* Re: [PATCH 14/14] Add new driver 'rndis_wlan' for wireless RNDIS devices.
From: David Brownell @ 2008-01-27 16:43 UTC (permalink / raw)
To: Jussi Kivilinna; +Cc: linux-wireless, netdev, bjd
In-Reply-To: <20080125225151.11716.66656.stgit@fate.lan>
On Friday 25 January 2008, Jussi Kivilinna wrote:
> New driver for wireless RNDIS devices. So far only known chip that uses
> wireless RNDIS is Broadcom 4320. Driver detects all RNDIS devices that
> have RNDIS wireless physical medium. At least following devices are
> detected:
>
> Buffalo WLI-U2-KG125S
> U.S. Robotics USR5421
> Belkin F5D7051
> Linksys WUSB54GSv2
> Linksys WUSB54GSC
> Asus WL169gE
> Eminent EM4045
> BT Voyager 1055
> Linksys WUSB54GSv1
> U.S. Robotics USR5420
> BUFFALO WLI-USB-G54
>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
OK by me, but I don't need to be in the loop on this one.
So I'm not really reviewing this code. Not that I know
much about this wireless stack!
> ---
>
> MAINTAINERS | 6
> drivers/net/wireless/Kconfig | 28
> drivers/net/wireless/Makefile | 2
> drivers/net/wireless/rndis_wlan.c | 2757 +++++++++++++++++++++++++++++++++++++
> 4 files changed, 2793 insertions(+), 0 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2340cfb..d6773c2 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4031,6 +4031,12 @@ L: video4linux-list@redhat.com
> W: http://www.linux-projects.org
> S: Maintained
>
> +USB WIRELESS RNDIS DRIVER (rndis_wlan)
> +P: Jussi Kivilinna
> +M: jussi.kivilinna@mbnet.fi
> +L: linux-wireless@vger.kernel.org
> +S: Maintained
> +
> USB ZC0301 DRIVER
> P: Luca Risolia
> M: luca.risolia@studio.unibo.it
> diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
> index 2c08c0a..962663c 100644
> --- a/drivers/net/wireless/Kconfig
> +++ b/drivers/net/wireless/Kconfig
> @@ -545,6 +545,34 @@ config USB_ZD1201
> To compile this driver as a module, choose M here: the
> module will be called zd1201.
>
> +config USB_NET_RNDIS_WLAN
> + tristate "Wireless RNDIS USB support"
> + depends on USB && WLAN_80211 && EXPERIMENTAL
> + select USB_USBNET
> + select USB_NET_CDCETHER
> + select USB_NET_RNDIS_HOST
> + select WIRELESS_EXT
> + ---help---
> + This is a driver for wireless RNDIS devices.
> + These are USB based adapters found in devices such as:
> +
> + Buffalo WLI-U2-KG125S
> + U.S. Robotics USR5421
> + Belkin F5D7051
> + Linksys WUSB54GSv2
> + Linksys WUSB54GSC
> + Asus WL169gE
> + Eminent EM4045
> + BT Voyager 1055
> + Linksys WUSB54GSv1
> + U.S. Robotics USR5420
> + BUFFALO WLI-USB-G54
> +
> + All of these devices are based on Broadcom 4320 chip which is the
> + only wireless RNDIS chip known to date.
> +
> + If you choose to build a module, it'll be called rndis_wlan.
> +
> config RTL8187
> tristate "Realtek 8187 USB support"
> depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
> diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
> index 6f32b53..e3e521e 100644
> --- a/drivers/net/wireless/Makefile
> +++ b/drivers/net/wireless/Makefile
> @@ -44,6 +44,8 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw/
> obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
> obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
>
> +obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
> +
> obj-$(CONFIG_USB_ZD1201) += zd1201.o
> obj-$(CONFIG_LIBERTAS) += libertas/
>
> diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
> new file mode 100644
> index 0000000..d3ecf89
> --- /dev/null
> +++ b/drivers/net/wireless/rndis_wlan.c
> @@ -0,0 +1,2757 @@
> +/*
> + * Driver for RNDIS based wireless USB devices.
> + *
> + * Copyright (C) 2007 by Bjorge Dijkstra <bjd@jooz.net>
> + * Copyright (C) 2008 by Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + *
> + * Portions of this file are based on NDISwrapper project,
> + * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
> + * http://ndiswrapper.sourceforge.net/
> + */
> +
> +// #define DEBUG // error path messages, extra info
> +// #define VERBOSE // more; success messages
> +
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/netdevice.h>
> +#include <linux/etherdevice.h>
> +#include <linux/ethtool.h>
> +#include <linux/workqueue.h>
> +#include <linux/mutex.h>
> +#include <linux/mii.h>
> +#include <linux/usb.h>
> +#include <linux/usb/cdc.h>
> +#include <linux/wireless.h>
> +#include <linux/if_arp.h>
> +#include <linux/ctype.h>
> +#include <linux/spinlock.h>
> +#include <net/iw_handler.h>
> +#include <net/ieee80211.h>
> +#include <linux/usb/usbnet.h>
> +#include <linux/usb/rndis_host.h>
> +
> +
> +/* NOTE: All these are settings for Broadcom chipset */
> +static char modparam_country[4] = "EU";
> +module_param_string(country, modparam_country, 4, 0444);
> +MODULE_PARM_DESC(country, "Country code (ISO 3166-1 alpha-2), default: EU");
> +
> +static int modparam_frameburst = 1;
> +module_param_named(frameburst, modparam_frameburst, int, 0444);
> +MODULE_PARM_DESC(frameburst, "enable frame bursting (default: on)");
> +
> +static int modparam_afterburner = 0;
> +module_param_named(afterburner, modparam_afterburner, int, 0444);
> +MODULE_PARM_DESC(afterburner,
> + "enable afterburner aka '125 High Speed Mode' (default: off)");
> +
> +static int modparam_power_save = 0;
> +module_param_named(power_save, modparam_power_save, int, 0444);
> +MODULE_PARM_DESC(power_save,
> + "set power save mode: 0=off, 1=on, 2=fast (default: off)");
> +
> +static int modparam_power_output = 3;
> +module_param_named(power_output, modparam_power_output, int, 0444);
> +MODULE_PARM_DESC(power_output,
> + "set power output: 0=25%, 1=50%, 2=75%, 3=100% (default: 100%)");
> +
> +static int modparam_roamtrigger = -70;
> +module_param_named(roamtrigger, modparam_roamtrigger, int, 0444);
> +MODULE_PARM_DESC(roamtrigger,
> + "set roaming dBm trigger: -80=optimize for distance, "
> + "-60=bandwidth (default: -70)");
> +
> +static int modparam_roamdelta = 1;
> +module_param_named(roamdelta, modparam_roamdelta, int, 0444);
> +MODULE_PARM_DESC(roamdelta,
> + "set roaming tendency: 0=aggressive, 1=moderate, "
> + "2=conservative (default: moderate)");
> +
> +static int modparam_workaround_interval = 500;
> +module_param_named(workaround_interval, modparam_workaround_interval,
> + int, 0444);
> +MODULE_PARM_DESC(workaround_interval,
> + "set stall workaround interval in msecs (default: 500)");
> +
> +
> +/* various RNDIS OID defs */
> +#define OID_GEN_LINK_SPEED ccpu2(0x00010107)
> +#define OID_GEN_RNDIS_CONFIG_PARAMETER ccpu2(0x0001021b)
> +
> +#define OID_GEN_XMIT_OK ccpu2(0x00020101)
> +#define OID_GEN_RCV_OK ccpu2(0x00020102)
> +#define OID_GEN_XMIT_ERROR ccpu2(0x00020103)
> +#define OID_GEN_RCV_ERROR ccpu2(0x00020104)
> +#define OID_GEN_RCV_NO_BUFFER ccpu2(0x00020105)
> +
> +#define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
> +#define OID_802_3_CURRENT_ADDRESS ccpu2(0x01010102)
> +#define OID_802_3_MULTICAST_LIST ccpu2(0x01010103)
> +#define OID_802_3_MAXIMUM_LIST_SIZE ccpu2(0x01010104)
> +
> +#define OID_802_11_BSSID ccpu2(0x0d010101)
> +#define OID_802_11_SSID ccpu2(0x0d010102)
> +#define OID_802_11_INFRASTRUCTURE_MODE ccpu2(0x0d010108)
> +#define OID_802_11_ADD_WEP ccpu2(0x0d010113)
> +#define OID_802_11_REMOVE_WEP ccpu2(0x0d010114)
> +#define OID_802_11_DISASSOCIATE ccpu2(0x0d010115)
> +#define OID_802_11_AUTHENTICATION_MODE ccpu2(0x0d010118)
> +#define OID_802_11_PRIVACY_FILTER ccpu2(0x0d010119)
> +#define OID_802_11_BSSID_LIST_SCAN ccpu2(0x0d01011a)
> +#define OID_802_11_ENCRYPTION_STATUS ccpu2(0x0d01011b)
> +#define OID_802_11_ADD_KEY ccpu2(0x0d01011d)
> +#define OID_802_11_REMOVE_KEY ccpu2(0x0d01011e)
> +#define OID_802_11_PMKID ccpu2(0x0d010123)
> +#define OID_802_11_NETWORK_TYPES_SUPPORTED ccpu2(0x0d010203)
> +#define OID_802_11_NETWORK_TYPE_IN_USE ccpu2(0x0d010204)
> +#define OID_802_11_TX_POWER_LEVEL ccpu2(0x0d010205)
> +#define OID_802_11_RSSI ccpu2(0x0d010206)
> +#define OID_802_11_RSSI_TRIGGER ccpu2(0x0d010207)
> +#define OID_802_11_FRAGMENTATION_THRESHOLD ccpu2(0x0d010209)
> +#define OID_802_11_RTS_THRESHOLD ccpu2(0x0d01020a)
> +#define OID_802_11_SUPPORTED_RATES ccpu2(0x0d01020e)
> +#define OID_802_11_CONFIGURATION ccpu2(0x0d010211)
> +#define OID_802_11_BSSID_LIST ccpu2(0x0d010217)
> +
> +
> +/* Typical noise/maximum signal level values taken from ndiswrapper iw_ndis.h */
> +#define WL_NOISE -96 /* typical noise level in dBm */
> +#define WL_SIGMAX -32 /* typical maximum signal level in dBm */
> +
> +
> +/* Assume that Broadcom 4320 (only chipset at time of writing known to be
> + * based on wireless rndis) has default txpower of 13dBm.
> + * This value is from Linksys WUSB54GSC User Guide, Appendix F: Specifications.
> + * 13dBm == 19.9mW
> + */
> +#define BCM4320_DEFAULT_TXPOWER 20
> +
> +
> +/* codes for "status" field of completion messages */
> +#define RNDIS_STATUS_ADAPTER_NOT_READY ccpu2(0xc0010011)
> +#define RNDIS_STATUS_ADAPTER_NOT_OPEN ccpu2(0xc0010012)
> +
> +
> +/* NDIS data structures. Taken from wpa_supplicant driver_ndis.c
> + * slightly modified for datatype endianess, etc
> + */
> +#define NDIS_802_11_LENGTH_SSID 32
> +#define NDIS_802_11_LENGTH_RATES 8
> +#define NDIS_802_11_LENGTH_RATES_EX 16
> +
> +struct NDIS_802_11_SSID {
> + __le32 SsidLength;
> + u8 Ssid[NDIS_802_11_LENGTH_SSID];
> +} __attribute__((packed));
> +
> +enum NDIS_802_11_NETWORK_TYPE {
> + Ndis802_11FH,
> + Ndis802_11DS,
> + Ndis802_11OFDM5,
> + Ndis802_11OFDM24,
> + Ndis802_11NetworkTypeMax
> +};
> +
> +struct NDIS_802_11_CONFIGURATION_FH {
> + __le32 Length;
> + __le32 HopPattern;
> + __le32 HopSet;
> + __le32 DwellTime;
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_CONFIGURATION {
> + __le32 Length;
> + __le32 BeaconPeriod;
> + __le32 ATIMWindow;
> + __le32 DSConfig;
> + struct NDIS_802_11_CONFIGURATION_FH FHConfig;
> +} __attribute__((packed));
> +
> +enum NDIS_802_11_NETWORK_INFRASTRUCTURE {
> + Ndis802_11IBSS,
> + Ndis802_11Infrastructure,
> + Ndis802_11AutoUnknown,
> + Ndis802_11InfrastructureMax
> +};
> +
> +enum NDIS_802_11_AUTHENTICATION_MODE {
> + Ndis802_11AuthModeOpen,
> + Ndis802_11AuthModeShared,
> + Ndis802_11AuthModeAutoSwitch,
> + Ndis802_11AuthModeWPA,
> + Ndis802_11AuthModeWPAPSK,
> + Ndis802_11AuthModeWPANone,
> + Ndis802_11AuthModeWPA2,
> + Ndis802_11AuthModeWPA2PSK,
> + Ndis802_11AuthModeMax
> +};
> +
> +enum NDIS_802_11_ENCRYPTION_STATUS {
> + Ndis802_11WEPEnabled,
> + Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
> + Ndis802_11WEPDisabled,
> + Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled,
> + Ndis802_11WEPKeyAbsent,
> + Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent,
> + Ndis802_11WEPNotSupported,
> + Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported,
> + Ndis802_11Encryption2Enabled,
> + Ndis802_11Encryption2KeyAbsent,
> + Ndis802_11Encryption3Enabled,
> + Ndis802_11Encryption3KeyAbsent
> +};
> +
> +enum NDIS_802_11_PRIVACY_FILTER {
> + Ndis802_11PrivFilterAcceptAll,
> + Ndis802_11PrivFilter8021xWEP
> +};
> +
> +struct NDIS_WLAN_BSSID_EX {
> + __le32 Length;
> + u8 MacAddress[6];
> + u8 Padding[2];
> + struct NDIS_802_11_SSID Ssid;
> + __le32 Privacy;
> + __le32 Rssi;
> + enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
> + struct NDIS_802_11_CONFIGURATION Configuration;
> + enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
> + u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
> + __le32 IELength;
> + u8 IEs[0];
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_BSSID_LIST_EX {
> + __le32 NumberOfItems;
> + struct NDIS_WLAN_BSSID_EX Bssid[0];
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_FIXED_IEs {
> + u8 Timestamp[8];
> + __le16 BeaconInterval;
> + __le16 Capabilities;
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_WEP {
> + __le32 Length;
> + __le32 KeyIndex;
> + __le32 KeyLength;
> + u8 KeyMaterial[32];
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_KEY {
> + __le32 Length;
> + __le32 KeyIndex;
> + __le32 KeyLength;
> + u8 Bssid[6];
> + u8 Padding[6];
> + __le64 KeyRSC;
> + u8 KeyMaterial[32];
> +} __attribute__((packed));
> +
> +struct NDIS_802_11_REMOVE_KEY {
> + __le32 Length;
> + __le32 KeyIndex;
> + u8 Bssid[6];
> +} __attribute__((packed));
> +
> +struct RNDIS_CONFIG_PARAMETER_INFOBUFFER {
> + __le32 ParameterNameOffset;
> + __le32 ParameterNameLength;
> + __le32 ParameterType;
> + __le32 ParameterValueOffset;
> + __le32 ParameterValueLength;
> +} __attribute__((packed));
> +
> +/* these have to match what is in wpa_supplicant */
> +enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
> +enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, CIPHER_WEP104 }
> + wpa_cipher;
> +enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, KEY_MGMT_802_1X_NO_WPA,
> + KEY_MGMT_WPA_NONE } wpa_key_mgmt;
> +
> +/*
> + * private data
> + */
> +#define NET_TYPE_11FB 0
> +
> +#define CAP_MODE_80211A 1
> +#define CAP_MODE_80211B 2
> +#define CAP_MODE_80211G 4
> +#define CAP_MODE_MASK 7
> +#define CAP_SUPPORT_TXPOWER 8
> +
> +#define WORK_CONNECTION_EVENT (1<<0)
> +#define WORK_SET_MULTICAST_LIST (1<<1)
> +
> +/* RNDIS device private data */
> +struct rndis_wext_private {
> + char name[32];
> +
> + struct usbnet *usbdev;
> +
> + struct workqueue_struct *workqueue;
> + struct delayed_work stats_work;
> + struct work_struct work;
> + struct mutex command_lock;
> + spinlock_t stats_lock;
> + unsigned long work_pending;
> +
> + struct iw_statistics iwstats;
> + struct iw_statistics privstats;
> +
> + int nick_len;
> + char nick[32];
> +
> + int caps;
> + int multicast_size;
> +
> + /* module parameters */
> + char param_country[4];
> + int param_frameburst;
> + int param_afterburner;
> + int param_power_save;
> + int param_power_output;
> + int param_roamtrigger;
> + int param_roamdelta;
> + u32 param_workaround_interval;
> +
> + /* hardware state */
> + int radio_on;
> + int infra_mode;
> + struct NDIS_802_11_SSID essid;
> +
> + /* encryption stuff */
> + int encr_tx_key_index;
> + char encr_keys[4][32];
> + int encr_key_len[4];
> + int wpa_version;
> + int wpa_keymgmt;
> + int wpa_authalg;
> + int wpa_ie_len;
> + u8 *wpa_ie;
> + int wpa_cipher_pair;
> + int wpa_cipher_group;
> +};
> +
> +
> +static const int freq_chan[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
> + 2447, 2452, 2457, 2462, 2467, 2472, 2484 };
> +
> +static const int rates_80211g[8] = { 6, 9, 12, 18, 24, 36, 48, 54 };
> +
> +static const int bcm4320_power_output[4] = { 25, 50, 75, 100 };
> +
> +static const unsigned char zero_bssid[ETH_ALEN] = {0,};
> +static const unsigned char ffff_bssid[ETH_ALEN] = { 0xff, 0xff, 0xff,
> + 0xff, 0xff, 0xff };
> +
> +
> +static struct rndis_wext_private *get_rndis_wext_priv(struct usbnet *dev)
> +{
> + return (struct rndis_wext_private *)dev->driver_priv;
> +}
> +
> +
> +static u32 get_bcm4320_power(struct rndis_wext_private *priv)
> +{
> + return BCM4320_DEFAULT_TXPOWER *
> + bcm4320_power_output[priv->param_power_output] / 100;
> +}
> +
> +
> +/* translate error code */
> +static int rndis_error_status(__le32 rndis_status)
> +{
> + int ret = -EINVAL;
> + switch (rndis_status) {
> + case RNDIS_STATUS_SUCCESS:
> + ret = 0;
> + break;
> + case RNDIS_STATUS_FAILURE:
> + case RNDIS_STATUS_INVALID_DATA:
> + ret = -EINVAL;
> + break;
> + case RNDIS_STATUS_NOT_SUPPORTED:
> + ret = -EOPNOTSUPP;
> + break;
> + case RNDIS_STATUS_ADAPTER_NOT_READY:
> + case RNDIS_STATUS_ADAPTER_NOT_OPEN:
> + ret = -EBUSY;
> + break;
> + }
> + return ret;
> +}
> +
> +
> +static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> + union {
> + void *buf;
> + struct rndis_msg_hdr *header;
> + struct rndis_query *get;
> + struct rndis_query_c *get_c;
> + } u;
> + int ret, buflen;
> +
> + buflen = *len + sizeof(*u.get);
> + if (buflen < CONTROL_BUFFER_SIZE)
> + buflen = CONTROL_BUFFER_SIZE;
> + u.buf = kmalloc(buflen, GFP_KERNEL);
> + if (!u.buf)
> + return -ENOMEM;
> + memset(u.get, 0, sizeof *u.get);
> + u.get->msg_type = RNDIS_MSG_QUERY;
> + u.get->msg_len = ccpu2(sizeof *u.get);
> + u.get->oid = oid;
> +
> + mutex_lock(&priv->command_lock);
> + ret = rndis_command(dev, u.header);
> + mutex_unlock(&priv->command_lock);
> +
> + if (ret == 0) {
> + ret = le32_to_cpu(u.get_c->len);
> + *len = (*len > ret) ? ret : *len;
> + memcpy(data, u.buf + le32_to_cpu(u.get_c->offset) + 8, *len);
> + ret = rndis_error_status(u.get_c->status);
> + }
> +
> + kfree(u.buf);
> + return ret;
> +}
> +
> +
> +static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> + union {
> + void *buf;
> + struct rndis_msg_hdr *header;
> + struct rndis_set *set;
> + struct rndis_set_c *set_c;
> + } u;
> + int ret, buflen;
> +
> + buflen = len + sizeof(*u.set);
> + if (buflen < CONTROL_BUFFER_SIZE)
> + buflen = CONTROL_BUFFER_SIZE;
> + u.buf = kmalloc(buflen, GFP_KERNEL);
> + if (!u.buf)
> + return -ENOMEM;
> +
> + memset(u.set, 0, sizeof *u.set);
> + u.set->msg_type = RNDIS_MSG_SET;
> + u.set->msg_len = cpu_to_le32(sizeof(*u.set) + len);
> + u.set->oid = oid;
> + u.set->len = cpu_to_le32(len);
> + u.set->offset = ccpu2(sizeof(*u.set) - 8);
> + u.set->handle = ccpu2(0);
> + memcpy(u.buf + sizeof(*u.set), data, len);
> +
> + mutex_lock(&priv->command_lock);
> + ret = rndis_command(dev, u.header);
> + mutex_unlock(&priv->command_lock);
> +
> + if (ret == 0)
> + ret = rndis_error_status(u.set_c->status);
> +
> + kfree(u.buf);
> + return ret;
> +}
> +
> +
> +/*
> + * Specs say that we can only set config parameters only soon after device
> + * initialization.
> + * value_type: 0 = u32, 2 = unicode string
> + */
> +static int rndis_set_config_parameter(struct usbnet *dev, char *param,
> + int value_type, void *value)
> +{
> + struct RNDIS_CONFIG_PARAMETER_INFOBUFFER *infobuf;
> + int value_len, info_len, param_len, ret, i;
> + __le16 *unibuf;
> + __le32 *dst_value;
> +
> + if (value_type == 0)
> + value_len = sizeof(__le32);
> + else if (value_type == 2)
> + value_len = strlen(value) * sizeof(__le16);
> + else
> + return -EINVAL;
> +
> + param_len = strlen(param) * sizeof(__le16);
> + info_len = sizeof(*infobuf) + param_len + value_len;
> +
> +#ifdef DEBUG
> + info_len += 12;
> +#endif
> + infobuf = kmalloc(info_len, GFP_KERNEL);
> + if (!infobuf)
> + return -ENOMEM;
> +
> +#ifdef DEBUG
> + info_len -= 12;
> + /* extra 12 bytes are for padding (debug output) */
> + memset(infobuf, 0xCC, info_len + 12);
> +#endif
> +
> + if (value_type == 2)
> + devdbg(dev, "setting config parameter: %s, value: %s",
> + param, (u8 *)value);
> + else
> + devdbg(dev, "setting config parameter: %s, value: %d",
> + param, *(u32 *)value);
> +
> + infobuf->ParameterNameOffset = cpu_to_le32(sizeof(*infobuf));
> + infobuf->ParameterNameLength = cpu_to_le32(param_len);
> + infobuf->ParameterType = cpu_to_le32(value_type);
> + infobuf->ParameterValueOffset = cpu_to_le32(sizeof(*infobuf) +
> + param_len);
> + infobuf->ParameterValueLength = cpu_to_le32(value_len);
> +
> + /* simple string to unicode string conversion */
> + unibuf = (void *)infobuf + sizeof(*infobuf);
> + for (i = 0; i < param_len / sizeof(__le16); i++)
> + unibuf[i] = cpu_to_le16(param[i]);
> +
> + if (value_type == 2) {
> + unibuf = (void *)infobuf + sizeof(*infobuf) + param_len;
> + for (i = 0; i < value_len / sizeof(__le16); i++)
> + unibuf[i] = cpu_to_le16(((u8 *)value)[i]);
> + } else {
> + dst_value = (void *)infobuf + sizeof(*infobuf) + param_len;
> + *dst_value = cpu_to_le32(*(u32 *)value);
> + }
> +
> +#ifdef DEBUG
> + devdbg(dev, "info buffer (len: %d):", info_len);
> + for (i = 0; i < info_len; i += 12) {
> + u32 *tmp = (u32 *)((u8 *)infobuf + i);
> + devdbg(dev, "%08X:%08X:%08X",
> + cpu_to_be32(tmp[0]),
> + cpu_to_be32(tmp[1]),
> + cpu_to_be32(tmp[2]));
> + }
> +#endif
> +
> + ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER,
> + infobuf, info_len);
> + if (ret != 0)
> + devdbg(dev, "setting rndis config paramater failed, %d.", ret);
> +
> + kfree(infobuf);
> + return ret;
> +}
> +
> +static int rndis_set_config_parameter_str(struct usbnet *dev,
> + char *param, char *value)
> +{
> + return(rndis_set_config_parameter(dev, param, 2, value));
> +}
> +
> +/*static int rndis_set_config_parameter_u32(struct usbnet *dev,
> + char *param, u32 value)
> +{
> + return(rndis_set_config_parameter(dev, param, 0, &value));
> +}*/
> +
> +
> +/*
> + * data conversion functions
> + */
> +static int level_to_qual(int level)
> +{
> + int qual = 100 * (level - WL_NOISE) / (WL_SIGMAX - WL_NOISE);
> + return qual >= 0 ? (qual <= 100 ? qual : 100) : 0;
> +}
> +
> +
> +static void dsconfig_to_freq(unsigned int dsconfig, struct iw_freq *freq)
> +{
> + freq->e = 0;
> + freq->i = 0;
> + freq->flags = 0;
> +
> + /* see comment in wireless.h above the "struct iw_freq"
> + * definition for an explanation of this if
> + * NOTE: 1000000 is due to the kHz
> + */
> + if (dsconfig > 1000000) {
> + freq->m = dsconfig / 10;
> + freq->e = 1;
> + } else
> + freq->m = dsconfig;
> +
> + /* convert from kHz to Hz */
> + freq->e += 3;
> +}
> +
> +
> +static int freq_to_dsconfig(struct iw_freq *freq, unsigned int *dsconfig)
> +{
> + if (freq->m < 1000 && freq->e == 0) {
> + if (freq->m >= 1 &&
> + freq->m <= (sizeof(freq_chan) / sizeof(freq_chan[0])))
> + *dsconfig = freq_chan[freq->m - 1] * 1000;
> + else
> + return -1;
> + } else {
> + int i;
> + *dsconfig = freq->m;
> + for (i = freq->e; i > 0; i--)
> + *dsconfig *= 10;
> + *dsconfig /= 1000;
> + }
> +
> + return 0;
> +}
> +
> +
> +/*
> + * common functions
> + */
> +static int
> +add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index);
> +
> +static int get_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
> +{
> + int ret, len;
> +
> + len = sizeof(*ssid);
> + ret = rndis_query_oid(usbdev, OID_802_11_SSID, ssid, &len);
> +
> + if (ret != 0)
> + ssid->SsidLength = 0;
> +
> +#ifdef DEBUG
> + {
> + unsigned char tmp[NDIS_802_11_LENGTH_SSID + 1];
> +
> + memcpy(tmp, ssid->Ssid, le32_to_cpu(ssid->SsidLength));
> + tmp[le32_to_cpu(ssid->SsidLength)] = 0;
> + devdbg(usbdev, "get_essid: '%s', ret: %d", tmp, ret);
> + }
> +#endif
> + return ret;
> +}
> +
> +
> +static int set_essid(struct usbnet *usbdev, struct NDIS_802_11_SSID *ssid)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + int ret;
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_SSID, ssid, sizeof(*ssid));
> + if (ret == 0) {
> + memcpy(&priv->essid, ssid, sizeof(priv->essid));
> + priv->radio_on = 1;
> + devdbg(usbdev, "set_essid: radio_on = 1");
> + }
> +
> + return ret;
> +}
> +
> +
> +static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
> +{
> + int ret, len;
> +
> + len = ETH_ALEN;
> + ret = rndis_query_oid(usbdev, OID_802_11_BSSID, bssid, &len);
> +
> + if (ret != 0)
> + memset(bssid, 0, ETH_ALEN);
> +
> + return ret;
> +}
> +
> +
> +static int is_associated(struct usbnet *usbdev)
> +{
> + u8 bssid[ETH_ALEN];
> + int ret;
> +
> + ret = get_bssid(usbdev, bssid);
> +
> + return(ret == 0 && memcmp(bssid, zero_bssid, ETH_ALEN) != 0);
> +}
> +
> +
> +static int disassociate(struct usbnet *usbdev, int reset_ssid)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct NDIS_802_11_SSID ssid;
> + int i, ret = 0;
> +
> + if (priv->radio_on) {
> + ret = rndis_set_oid(usbdev, OID_802_11_DISASSOCIATE, NULL, 0);
> + if (ret == 0) {
> + priv->radio_on = 0;
> + devdbg(usbdev, "disassociate: radio_on = 0");
> +
> + if (reset_ssid)
> + msleep(100);
> + }
> + }
> +
> + /* disassociate causes radio to be turned off; if reset_ssid
> + * is given, set random ssid to enable radio */
> + if (reset_ssid) {
> + ssid.SsidLength = cpu_to_le32(sizeof(ssid.Ssid));
> + get_random_bytes(&ssid.Ssid[2], sizeof(ssid.Ssid)-2);
> + ssid.Ssid[0] = 0x1;
> + ssid.Ssid[1] = 0xff;
> + for (i = 2; i < sizeof(ssid.Ssid); i++)
> + ssid.Ssid[i] = 0x1 + (ssid.Ssid[i] * 0xfe / 0xff);
> + ret = set_essid(usbdev, &ssid);
> + }
> + return ret;
> +}
> +
> +
> +static int set_auth_mode(struct usbnet *usbdev, int wpa_version, int authalg)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tmp;
> + int auth_mode, ret;
> +
> + devdbg(usbdev, "set_auth_mode: wpa_version=0x%x authalg=0x%x "
> + "keymgmt=0x%x", wpa_version, authalg, priv->wpa_keymgmt);
> +
> + if (wpa_version & IW_AUTH_WPA_VERSION_WPA2) {
> + if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
> + auth_mode = Ndis802_11AuthModeWPA2;
> + else
> + auth_mode = Ndis802_11AuthModeWPA2PSK;
> + } else if (wpa_version & IW_AUTH_WPA_VERSION_WPA) {
> + if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
> + auth_mode = Ndis802_11AuthModeWPA;
> + else if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_PSK)
> + auth_mode = Ndis802_11AuthModeWPAPSK;
> + else
> + auth_mode = Ndis802_11AuthModeWPANone;
> + } else if (authalg & IW_AUTH_ALG_SHARED_KEY) {
> + if (authalg & IW_AUTH_ALG_OPEN_SYSTEM)
> + auth_mode = Ndis802_11AuthModeAutoSwitch;
> + else
> + auth_mode = Ndis802_11AuthModeShared;
> + } else
> + auth_mode = Ndis802_11AuthModeOpen;
> +
> + tmp = cpu_to_le32(auth_mode);
> + ret = rndis_set_oid(usbdev, OID_802_11_AUTHENTICATION_MODE, &tmp,
> + sizeof(tmp));
> + if (ret != 0) {
> + devwarn(usbdev, "setting auth mode failed (%08X)", ret);
> + return ret;
> + }
> +
> + priv->wpa_version = wpa_version;
> + priv->wpa_authalg = authalg;
> + return 0;
> +}
> +
> +
> +static int set_priv_filter(struct usbnet *usbdev)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tmp;
> +
> + devdbg(usbdev, "set_priv_filter: wpa_version=0x%x", priv->wpa_version);
> +
> + if (priv->wpa_version & IW_AUTH_WPA_VERSION_WPA2 ||
> + priv->wpa_version & IW_AUTH_WPA_VERSION_WPA)
> + tmp = cpu_to_le32(Ndis802_11PrivFilter8021xWEP);
> + else
> + tmp = cpu_to_le32(Ndis802_11PrivFilterAcceptAll);
> +
> + return rndis_set_oid(usbdev, OID_802_11_PRIVACY_FILTER, &tmp,
> + sizeof(tmp));
> +}
> +
> +
> +static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tmp;
> + int encr_mode, ret;
> +
> + devdbg(usbdev, "set_encr_mode: cipher_pair=0x%x cipher_group=0x%x",
> + pairwise,
> + groupwise);
> +
> + if (pairwise & IW_AUTH_CIPHER_CCMP)
> + encr_mode = Ndis802_11Encryption3Enabled;
> + else if (pairwise & IW_AUTH_CIPHER_TKIP)
> + encr_mode = Ndis802_11Encryption2Enabled;
> + else if (pairwise &
> + (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
> + encr_mode = Ndis802_11Encryption1Enabled;
> + else if (groupwise & IW_AUTH_CIPHER_CCMP)
> + encr_mode = Ndis802_11Encryption3Enabled;
> + else if (groupwise & IW_AUTH_CIPHER_TKIP)
> + encr_mode = Ndis802_11Encryption2Enabled;
> + else
> + encr_mode = Ndis802_11EncryptionDisabled;
> +
> + tmp = cpu_to_le32(encr_mode);
> + ret = rndis_set_oid(usbdev, OID_802_11_ENCRYPTION_STATUS, &tmp,
> + sizeof(tmp));
> + if (ret != 0) {
> + devwarn(usbdev, "setting encr mode failed (%08X)", ret);
> + return ret;
> + }
> +
> + priv->wpa_cipher_pair = pairwise;
> + priv->wpa_cipher_group = groupwise;
> + return 0;
> +}
> +
> +
> +static int set_assoc_params(struct usbnet *usbdev)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + set_auth_mode(usbdev, priv->wpa_version, priv->wpa_authalg);
> + set_priv_filter(usbdev);
> + set_encr_mode(usbdev, priv->wpa_cipher_pair, priv->wpa_cipher_group);
> +
> + return 0;
> +}
> +
> +
> +static int set_infra_mode(struct usbnet *usbdev, int mode)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tmp;
> + int ret, i;
> +
> + devdbg(usbdev, "set_infra_mode: infra_mode=0x%x", priv->infra_mode);
> +
> + tmp = cpu_to_le32(mode);
> + ret = rndis_set_oid(usbdev, OID_802_11_INFRASTRUCTURE_MODE, &tmp,
> + sizeof(tmp));
> + if (ret != 0) {
> + devwarn(usbdev, "setting infra mode failed (%08X)", ret);
> + return ret;
> + }
> +
> + /* NDIS drivers clear keys when infrastructure mode is
> + * changed. But Linux tools assume otherwise. So set the
> + * keys */
> + if (priv->wpa_keymgmt == 0 ||
> + priv->wpa_keymgmt == IW_AUTH_KEY_MGMT_802_1X) {
> + for (i = 0; i < 4; i++) {
> + if (priv->encr_key_len[i] > 0)
> + add_wep_key(usbdev, priv->encr_keys[i],
> + priv->encr_key_len[i], i);
> + }
> + }
> +
> + priv->infra_mode = mode;
> + return 0;
> +}
> +
> +
> +static void set_default_iw_params(struct usbnet *usbdev)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + priv->wpa_keymgmt = 0;
> + priv->wpa_version = 0;
> +
> + set_infra_mode(usbdev, Ndis802_11Infrastructure);
> + set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
> + IW_AUTH_ALG_OPEN_SYSTEM);
> + set_priv_filter(usbdev);
> + set_encr_mode(usbdev, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE);
> +}
> +
> +
> +static int deauthenticate(struct usbnet *usbdev)
> +{
> + int ret;
> +
> + ret = disassociate(usbdev, 1);
> + set_default_iw_params(usbdev);
> + return ret;
> +}
> +
> +
> +/* index must be 0 - N, as per NDIS */
> +static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct NDIS_802_11_WEP ndis_key;
> + int ret;
> +
> + if (key_len <= 0 || key_len > 32 || index < 0 || index >= 4)
> + return -EINVAL;
> +
> + memset(&ndis_key, 0, sizeof(ndis_key));
> +
> + ndis_key.Length = cpu_to_le32(sizeof(ndis_key));
> + ndis_key.KeyLength = cpu_to_le32(key_len);
> + ndis_key.KeyIndex = cpu_to_le32(index);
> + memcpy(&ndis_key.KeyMaterial, key, key_len);
> +
> + if (index == priv->encr_tx_key_index) {
> + ndis_key.KeyIndex |= cpu_to_le32(1 << 31);
> + ret = set_encr_mode(usbdev, IW_AUTH_CIPHER_WEP104,
> + IW_AUTH_CIPHER_NONE);
> + if (ret)
> + devwarn(usbdev, "encryption couldn't be enabled (%08X)",
> + ret);
> + }
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_ADD_WEP, &ndis_key,
> + sizeof(ndis_key));
> + if (ret != 0) {
> + devwarn(usbdev, "adding encryption key %d failed (%08X)",
> + index+1, ret);
> + return ret;
> + }
> +
> + priv->encr_key_len[index] = key_len;
> + memcpy(&priv->encr_keys[index], key, key_len);
> +
> + return 0;
> +}
> +
> +
> +/* remove_key is for both wep and wpa */
> +static int remove_key(struct usbnet *usbdev, int index, u8 bssid[ETH_ALEN])
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct NDIS_802_11_REMOVE_KEY remove_key;
> + __le32 keyindex;
> + int ret;
> +
> + if (priv->encr_key_len[index] == 0)
> + return 0;
> +
> + priv->encr_key_len[index] = 0;
> + memset(&priv->encr_keys[index], 0, sizeof(priv->encr_keys[index]));
> +
> + if (priv->wpa_cipher_pair == IW_AUTH_CIPHER_TKIP ||
> + priv->wpa_cipher_pair == IW_AUTH_CIPHER_CCMP ||
> + priv->wpa_cipher_group == IW_AUTH_CIPHER_TKIP ||
> + priv->wpa_cipher_group == IW_AUTH_CIPHER_CCMP) {
> + remove_key.Length = cpu_to_le32(sizeof(remove_key));
> + remove_key.KeyIndex = cpu_to_le32(index);
> + if (bssid) {
> + /* pairwise key */
> + if (memcmp(bssid, ffff_bssid, ETH_ALEN) != 0)
> + remove_key.KeyIndex |= cpu_to_le32(1 << 30);
> + memcpy(remove_key.Bssid, bssid,
> + sizeof(remove_key.Bssid));
> + } else
> + memset(remove_key.Bssid, 0xff,
> + sizeof(remove_key.Bssid));
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_KEY, &remove_key,
> + sizeof(remove_key));
> + if (ret != 0)
> + return ret;
> + } else {
> + keyindex = cpu_to_le32(index);
> + ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_WEP, &keyindex,
> + sizeof(keyindex));
> + if (ret != 0) {
> + devwarn(usbdev,
> + "removing encryption key %d failed (%08X)",
> + index, ret);
> + return ret;
> + }
> + }
> +
> + /* if it is transmit key, disable encryption */
> + if (index == priv->encr_tx_key_index)
> + set_encr_mode(usbdev, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE);
> +
> + return 0;
> +}
> +
> +
> +static void set_multicast_list(struct usbnet *usbdev)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct dev_mc_list *mclist;
> + __le32 filter;
> + int ret, i, size;
> + char *buf;
> +
> + filter = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
> +
> + if (usbdev->net->flags & IFF_PROMISC) {
> + filter |= RNDIS_PACKET_TYPE_PROMISCUOUS |
> + RNDIS_PACKET_TYPE_ALL_LOCAL;
> + } else if (usbdev->net->flags & IFF_ALLMULTI ||
> + usbdev->net->mc_count > priv->multicast_size) {
> + filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
> + } else if (usbdev->net->mc_count > 0) {
> + size = min(priv->multicast_size, usbdev->net->mc_count);
> + buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
> + if (!buf) {
> + devwarn(usbdev,
> + "couldn't alloc %d bytes of memory",
> + size * ETH_ALEN);
> + return;
> + }
> +
> + mclist = usbdev->net->mc_list;
> + for (i = 0; i < size && mclist; mclist = mclist->next) {
> + if (mclist->dmi_addrlen != ETH_ALEN)
> + continue;
> +
> + memcpy(buf + i * ETH_ALEN, mclist->dmi_addr, ETH_ALEN);
> + i++;
> + }
> +
> + ret = rndis_set_oid(usbdev, OID_802_3_MULTICAST_LIST, buf,
> + i * ETH_ALEN);
> + if (ret == 0 && i > 0)
> + filter |= RNDIS_PACKET_TYPE_MULTICAST;
> + else
> + filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
> +
> + devdbg(usbdev, "OID_802_3_MULTICAST_LIST(%d, max: %d) -> %d",
> + i, priv->multicast_size, ret);
> +
> + kfree(buf);
> + }
> +
> + ret = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &filter,
> + sizeof(filter));
> + if (ret < 0) {
> + devwarn(usbdev, "couldn't set packet filter: %08x",
> + le32_to_cpu(filter));
> + }
> +
> + devdbg(usbdev, "OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d",
> + le32_to_cpu(filter), ret);
> +}
> +
> +
> +/*
> + * wireless extension handlers
> + */
> +
> +static int rndis_iw_commit(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + /* dummy op */
> + return 0;
> +}
> +
> +
> +static int rndis_iw_get_range(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct iw_range *range = (struct iw_range *)extra;
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + int len, ret, i, j, num, has_80211g_rates;
> + u8 rates[8];
> + __le32 tx_power;
> +
> + devdbg(usbdev, "SIOCGIWRANGE");
> +
> + /* clear iw_range struct */
> + memset(range, 0, sizeof(*range));
> + wrqu->data.length = sizeof(*range);
> +
> + range->txpower_capa = IW_TXPOW_MWATT;
> + range->num_txpower = 1;
> + if (priv->caps & CAP_SUPPORT_TXPOWER) {
> + len = sizeof(tx_power);
> + ret = rndis_query_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
> + &tx_power, &len);
> + if (ret == 0 && le32_to_cpu(tx_power) != 0xFF)
> + range->txpower[0] = le32_to_cpu(tx_power);
> + else
> + range->txpower[0] = get_bcm4320_power(priv);
> + } else
> + range->txpower[0] = get_bcm4320_power(priv);
> +
> + len = sizeof(rates);
> + ret = rndis_query_oid(usbdev, OID_802_11_SUPPORTED_RATES, &rates,
> + &len);
> + has_80211g_rates = 0;
> + if (ret == 0) {
> + j = 0;
> + for (i = 0; i < len; i++) {
> + if (rates[i] == 0)
> + break;
> + range->bitrate[j] = (rates[i] & 0x7f) * 500000;
> + /* check for non 802.11b rates */
> + if (range->bitrate[j] == 6000000 ||
> + range->bitrate[j] == 9000000 ||
> + (range->bitrate[j] >= 12000000 &&
> + range->bitrate[j] != 22000000))
> + has_80211g_rates = 1;
> + j++;
> + }
> + range->num_bitrates = j;
> + } else
> + range->num_bitrates = 0;
> +
> + /* fill in 802.11g rates */
> + if (has_80211g_rates) {
> + num = range->num_bitrates;
> + for (i = 0; i < sizeof(rates_80211g); i++) {
> + for (j = 0; j < num; j++) {
> + if (range->bitrate[j] ==
> + rates_80211g[i] * 1000000)
> + break;
> + }
> + if (j == num)
> + range->bitrate[range->num_bitrates++] =
> + rates_80211g[i] * 1000000;
> + if (range->num_bitrates == IW_MAX_BITRATES)
> + break;
> + }
> +
> + /* estimated max real througput in bps */
> + range->throughput = 54 * 1000 * 1000 / 2;
> +
> + /* ~35% more with afterburner */
> + if (priv->param_afterburner)
> + range->throughput = range->throughput / 100 * 135;
> + } else {
> + /* estimated max real througput in bps */
> + range->throughput = 11 * 1000 * 1000 / 2;
> + }
> +
> + range->num_channels = (sizeof(freq_chan)/sizeof(freq_chan[0]));
> +
> + for (i = 0; i < (sizeof(freq_chan)/sizeof(freq_chan[0])) &&
> + i < IW_MAX_FREQUENCIES; i++) {
> + range->freq[i].i = i + 1;
> + range->freq[i].m = freq_chan[i] * 100000;
> + range->freq[i].e = 1;
> + }
> + range->num_frequency = i;
> +
> + range->min_rts = 0;
> + range->max_rts = 2347;
> + range->min_frag = 256;
> + range->max_frag = 2346;
> +
> + range->max_qual.qual = 100;
> + range->max_qual.level = 154;
> + range->max_qual.updated = IW_QUAL_QUAL_UPDATED
> + | IW_QUAL_LEVEL_UPDATED
> + | IW_QUAL_NOISE_INVALID;
> +
> + range->we_version_compiled = WIRELESS_EXT;
> + range->we_version_source = WIRELESS_EXT;
> +
> + range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
> + IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
> + return 0;
> +}
> +
> +
> +static int rndis_iw_get_name(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + strcpy(wrqu->name, priv->name);
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_essid(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
> +{
> + struct NDIS_802_11_SSID ssid;
> + int length = wrqu->essid.length;
> + struct usbnet *usbdev = dev->priv;
> +
> + devdbg(usbdev, "SIOCSIWESSID: [flags:%d,len:%d] '%.32s'",
> + wrqu->essid.flags, wrqu->essid.length, essid);
> +
> + if (length > NDIS_802_11_LENGTH_SSID)
> + length = NDIS_802_11_LENGTH_SSID;
> +
> + ssid.SsidLength = cpu_to_le32(length);
> + if (length > 0)
> + memcpy(ssid.Ssid, essid, length);
> + else
> + memset(ssid.Ssid, 0, NDIS_802_11_LENGTH_SSID);
> +
> + set_assoc_params(usbdev);
> +
> + if (!wrqu->essid.flags || length == 0)
> + return disassociate(usbdev, 1);
> + else
> + return set_essid(usbdev, &ssid);
> +}
> +
> +
> +static int rndis_iw_get_essid(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
> +{
> + struct NDIS_802_11_SSID ssid;
> + struct usbnet *usbdev = dev->priv;
> + int ret;
> +
> + ret = get_essid(usbdev, &ssid);
> +
> + if (ret == 0 && le32_to_cpu(ssid.SsidLength) > 0) {
> + wrqu->essid.flags = 1;
> + wrqu->essid.length = le32_to_cpu(ssid.SsidLength);
> + memcpy(essid, ssid.Ssid, wrqu->essid.length);
> + essid[wrqu->essid.length] = 0;
> + } else {
> + memset(essid, 0, sizeof(NDIS_802_11_LENGTH_SSID));
> + wrqu->essid.flags = 0;
> + wrqu->essid.length = 0;
> + }
> + devdbg(usbdev, "SIOCGIWESSID: %s", essid);
> + return ret;
> +}
> +
> +
> +static int rndis_iw_get_bssid(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + unsigned char bssid[ETH_ALEN];
> + int ret;
> + DECLARE_MAC_BUF(mac);
> +
> + ret = get_bssid(usbdev, bssid);
> +
> + if (ret == 0)
> + devdbg(usbdev, "SIOCGIWAP: %s", print_mac(mac, bssid));
> + else
> + devdbg(usbdev, "SIOCGIWAP: <not associated>");
> +
> + wrqu->ap_addr.sa_family = ARPHRD_ETHER;
> + memcpy(wrqu->ap_addr.sa_data, bssid, ETH_ALEN);
> +
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_bssid(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + u8 *bssid = (u8 *)wrqu->ap_addr.sa_data;
> + DECLARE_MAC_BUF(mac);
> + int ret;
> +
> + devdbg(usbdev, "SIOCSIWAP: %s", print_mac(mac, bssid));
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN);
> +
> + /* user apps may set ap's mac address, which is not required;
> + * they may fail to work if this function fails, so return
> + * success */
> + if (ret)
> + devwarn(usbdev, "setting AP mac address failed (%08X)", ret);
> +
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_auth(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct iw_param *p = &wrqu->param;
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + int ret = -ENOTSUPP;
> +
> + switch (p->flags & IW_AUTH_INDEX) {
> + case IW_AUTH_WPA_VERSION:
> + devdbg(usbdev, "SIOCSIWAUTH: WPA_VERSION, %08x", p->value);
> + priv->wpa_version = p->value;
> + ret = 0;
> + break;
> +
> + case IW_AUTH_CIPHER_PAIRWISE:
> + devdbg(usbdev, "SIOCSIWAUTH: CIPHER_PAIRWISE, %08x", p->value);
> + priv->wpa_cipher_pair = p->value;
> + ret = 0;
> + break;
> +
> + case IW_AUTH_CIPHER_GROUP:
> + devdbg(usbdev, "SIOCSIWAUTH: CIPHER_GROUP, %08x", p->value);
> + priv->wpa_cipher_group = p->value;
> + ret = 0;
> + break;
> +
> + case IW_AUTH_KEY_MGMT:
> + devdbg(usbdev, "SIOCSIWAUTH: KEY_MGMT, %08x", p->value);
> + priv->wpa_keymgmt = p->value;
> + ret = 0;
> + break;
> +
> + case IW_AUTH_TKIP_COUNTERMEASURES:
> + devdbg(usbdev, "SIOCSIWAUTH: TKIP_COUNTERMEASURES, %08x",
> + p->value);
> + ret = 0;
> + break;
> +
> + case IW_AUTH_DROP_UNENCRYPTED:
> + devdbg(usbdev, "SIOCSIWAUTH: DROP_UNENCRYPTED, %08x", p->value);
> + ret = 0;
> + break;
> +
> + case IW_AUTH_80211_AUTH_ALG:
> + devdbg(usbdev, "SIOCSIWAUTH: 80211_AUTH_ALG, %08x", p->value);
> + priv->wpa_authalg = p->value;
> + ret = 0;
> + break;
> +
> + case IW_AUTH_WPA_ENABLED:
> + devdbg(usbdev, "SIOCSIWAUTH: WPA_ENABLED, %08x", p->value);
> + if (wrqu->param.value)
> + deauthenticate(usbdev);
> + ret = 0;
> + break;
> +
> + case IW_AUTH_RX_UNENCRYPTED_EAPOL:
> + devdbg(usbdev, "SIOCSIWAUTH: RX_UNENCRYPTED_EAPOL, %08x",
> + p->value);
> + ret = 0;
> + break;
> +
> + case IW_AUTH_ROAMING_CONTROL:
> + devdbg(usbdev, "SIOCSIWAUTH: ROAMING_CONTROL, %08x", p->value);
> + ret = 0;
> + break;
> +
> + case IW_AUTH_PRIVACY_INVOKED:
> + devdbg(usbdev, "SIOCSIWAUTH: invalid cmd %d",
> + wrqu->param.flags & IW_AUTH_INDEX);
> + return -EOPNOTSUPP;
> +
> + default:
> + devdbg(usbdev, "SIOCSIWAUTH: UNKNOWN %08x, %08x",
> + p->flags & IW_AUTH_INDEX, p->value);
> + }
> + return ret;
> +}
> +
> +
> +static int rndis_iw_get_auth(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct iw_param *p = &wrqu->param;
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + switch (p->flags & IW_AUTH_INDEX) {
> + case IW_AUTH_WPA_VERSION:
> + p->value = priv->wpa_version;
> + break;
> + case IW_AUTH_CIPHER_PAIRWISE:
> + p->value = priv->wpa_cipher_pair;
> + break;
> + case IW_AUTH_CIPHER_GROUP:
> + p->value = priv->wpa_cipher_group;
> + break;
> + case IW_AUTH_KEY_MGMT:
> + p->value = priv->wpa_keymgmt;
> + break;
> + case IW_AUTH_80211_AUTH_ALG:
> + p->value = priv->wpa_authalg;
> + break;
> + default:
> + devdbg(usbdev, "SIOCGIWAUTH: invalid cmd %d",
> + wrqu->param.flags & IW_AUTH_INDEX);
> + return -EOPNOTSUPP;
> + }
> + return 0;
> +}
> +
> +
> +static int rndis_iw_get_mode(struct net_device *dev,
> + struct iw_request_info *info,
> + union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + switch (priv->infra_mode) {
> + case Ndis802_11IBSS:
> + wrqu->mode = IW_MODE_ADHOC;
> + break;
> + case Ndis802_11Infrastructure:
> + wrqu->mode = IW_MODE_INFRA;
> + break;
> + /*case Ndis802_11AutoUnknown:*/
> + default:
> + wrqu->mode = IW_MODE_AUTO;
> + break;
> + }
> + devdbg(usbdev, "SIOCGIWMODE: %08x", wrqu->mode);
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_mode(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + int mode;
> +
> + devdbg(usbdev, "SIOCSIWMODE: %08x", wrqu->mode);
> +
> + switch (wrqu->mode) {
> + case IW_MODE_ADHOC:
> + mode = Ndis802_11IBSS;
> + break;
> + case IW_MODE_INFRA:
> + mode = Ndis802_11Infrastructure;
> + break;
> + /*case IW_MODE_AUTO:*/
> + default:
> + mode = Ndis802_11AutoUnknown;
> + break;
> + }
> +
> + return set_infra_mode(usbdev, mode);
> +}
> +
> +
> +static int rndis_iw_set_encode(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + int ret, index, key_len;
> + u8 *key;
> +
> + index = (wrqu->encoding.flags & IW_ENCODE_INDEX);
> +
> + /* iwconfig gives index as 1 - N */
> + if (index > 0)
> + index--;
> + else
> + index = priv->encr_tx_key_index;
> +
> + if (index < 0 || index >= 4) {
> + devwarn(usbdev, "encryption index out of range (%u)", index);
> + return -EINVAL;
> + }
> +
> + /* remove key if disabled */
> + if (wrqu->data.flags & IW_ENCODE_DISABLED) {
> + if (remove_key(usbdev, index, NULL))
> + return -EINVAL;
> + else
> + return 0;
> + }
> +
> + /* global encryption state (for all keys) */
> + if (wrqu->data.flags & IW_ENCODE_OPEN)
> + ret = set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
> + IW_AUTH_ALG_OPEN_SYSTEM);
> + else /*if (wrqu->data.flags & IW_ENCODE_RESTRICTED)*/
> + ret = set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
> + IW_AUTH_ALG_SHARED_KEY);
> + if (ret != 0)
> + return ret;
> +
> + if (wrqu->data.length > 0) {
> + key_len = wrqu->data.length;
> + key = extra;
> + } else {
> + /* must be set as tx key */
> + if (priv->encr_key_len[index] == 0)
> + return -EINVAL;
> + key_len = priv->encr_key_len[index];
> + key = priv->encr_keys[index];
> + priv->encr_tx_key_index = index;
> + }
> +
> + if (add_wep_key(usbdev, key, key_len, index) != 0)
> + return -EINVAL;
> +
> + if (index == priv->encr_tx_key_index)
> + /* ndis drivers want essid to be set after setting encr */
> + set_essid(usbdev, &priv->essid);
> +
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_encode_ext(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct NDIS_802_11_KEY ndis_key;
> + int i, keyidx, ret;
> + u8 *addr;
> +
> + keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX;
> +
> + /* iwconfig gives index as 1 - N */
> + if (keyidx)
> + keyidx--;
> + else
> + keyidx = priv->encr_tx_key_index;
> +
> + if (keyidx < 0 || keyidx >= 4)
> + return -EINVAL;
> +
> + if (ext->alg == WPA_ALG_WEP) {
> + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
> + priv->encr_tx_key_index = keyidx;
> + return add_wep_key(usbdev, ext->key, ext->key_len, keyidx);
> + }
> +
> + if ((wrqu->encoding.flags & IW_ENCODE_DISABLED) ||
> + ext->alg == IW_ENCODE_ALG_NONE || ext->key_len == 0)
> + return remove_key(usbdev, keyidx, NULL);
> +
> + if (ext->key_len > sizeof(ndis_key.KeyMaterial))
> + return -1;
> +
> + memset(&ndis_key, 0, sizeof(ndis_key));
> +
> + ndis_key.Length = cpu_to_le32(sizeof(ndis_key) -
> + sizeof(ndis_key.KeyMaterial) + ext->key_len);
> + ndis_key.KeyLength = cpu_to_le32(ext->key_len);
> + ndis_key.KeyIndex = cpu_to_le32(keyidx);
> +
> + if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
> + for (i = 0; i < 6; i++)
> + ndis_key.KeyRSC |=
> + cpu_to_le64(ext->rx_seq[i] << (i * 8));
> + ndis_key.KeyIndex |= cpu_to_le32(1 << 29);
> + }
> +
> + addr = ext->addr.sa_data;
> + if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
> + /* group key */
> + if (priv->infra_mode == Ndis802_11IBSS)
> + memset(ndis_key.Bssid, 0xff, ETH_ALEN);
> + else
> + get_bssid(usbdev, ndis_key.Bssid);
> + } else {
> + /* pairwise key */
> + ndis_key.KeyIndex |= cpu_to_le32(1 << 30);
> + memcpy(ndis_key.Bssid, addr, ETH_ALEN);
> + }
> +
> + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
> + ndis_key.KeyIndex |= cpu_to_le32(1 << 31);
> +
> + if (ext->alg == IW_ENCODE_ALG_TKIP && ext->key_len == 32) {
> + /* wpa_supplicant gives us the Michael MIC RX/TX keys in
> + * different order than NDIS spec, so swap the order here. */
> + memcpy(ndis_key.KeyMaterial, ext->key, 16);
> + memcpy(ndis_key.KeyMaterial + 16, ext->key + 24, 8);
> + memcpy(ndis_key.KeyMaterial + 24, ext->key + 16, 8);
> + } else
> + memcpy(ndis_key.KeyMaterial, ext->key, ext->key_len);
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
> + le32_to_cpu(ndis_key.Length));
> + devdbg(usbdev, "SIOCSIWENCODEEXT: OID_802_11_ADD_KEY -> %08X", ret);
> + if (ret != 0)
> + return ret;
> +
> + priv->encr_key_len[keyidx] = ext->key_len;
> + memcpy(&priv->encr_keys[keyidx], ndis_key.KeyMaterial, ext->key_len);
> + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
> + priv->encr_tx_key_index = keyidx;
> +
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_scan(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct iw_param *param = &wrqu->param;
> + struct usbnet *usbdev = dev->priv;
> + union iwreq_data evt;
> + int ret = -EINVAL;
> + __le32 tmp;
> +
> + devdbg(usbdev, "SIOCSIWSCAN");
> +
> + if (param->flags == 0) {
> + tmp = ccpu2(1);
> + ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
> + sizeof(tmp));
> + evt.data.flags = 0;
> + evt.data.length = 0;
> + wireless_send_event(dev, SIOCGIWSCAN, &evt, NULL);
> + }
> + return ret;
> +}
> +
> +
> +static char *rndis_translate_scan(struct net_device *dev,
> + char *cev, char *end_buf, struct NDIS_WLAN_BSSID_EX *bssid)
> +{
> +#ifdef DEBUG
> + struct usbnet *usbdev = dev->priv;
> +#endif
> + struct ieee80211_info_element *ie;
> + char *current_val;
> + int bssid_len, ie_len, i;
> + u32 beacon, atim;
> + struct iw_event iwe;
> + unsigned char sbuf[32];
> + DECLARE_MAC_BUF(mac);
> +
> + bssid_len = le32_to_cpu(bssid->Length);
> +
> + devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->MacAddress));
> + iwe.cmd = SIOCGIWAP;
> + iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
> + memcpy(iwe.u.ap_addr.sa_data, bssid->MacAddress, ETH_ALEN);
> + cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_ADDR_LEN);
> +
> + devdbg(usbdev, "SSID(%d) %s",
> + le32_to_cpu(bssid->Ssid.SsidLength),
> + bssid->Ssid.Ssid);
> + iwe.cmd = SIOCGIWESSID;
> + iwe.u.essid.length = le32_to_cpu(bssid->Ssid.SsidLength);
> + iwe.u.essid.flags = 1;
> + cev = iwe_stream_add_point(cev, end_buf, &iwe,
> + bssid->Ssid.Ssid);
> +
> + devdbg(usbdev, "MODE %d",
> + le32_to_cpu(bssid->InfrastructureMode));
> + iwe.cmd = SIOCGIWMODE;
> + switch (le32_to_cpu(bssid->InfrastructureMode)) {
> + case Ndis802_11IBSS:
> + iwe.u.mode = IW_MODE_ADHOC;
> + break;
> + case Ndis802_11Infrastructure:
> + iwe.u.mode = IW_MODE_INFRA;
> + break;
> + /*case Ndis802_11AutoUnknown:*/
> + default:
> + iwe.u.mode = IW_MODE_AUTO;
> + break;
> + }
> + cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_UINT_LEN);
> +
> + devdbg(usbdev, "FREQ %d kHz",
> + le32_to_cpu(bssid->Configuration.DSConfig));
> + iwe.cmd = SIOCGIWFREQ;
> + dsconfig_to_freq(le32_to_cpu(bssid->Configuration.DSConfig),
> + &iwe.u.freq);
> + cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_FREQ_LEN);
> +
> + devdbg(usbdev, "QUAL %d", le32_to_cpu(bssid->Rssi));
> + iwe.cmd = IWEVQUAL;
> + iwe.u.qual.qual = level_to_qual(le32_to_cpu(bssid->Rssi));
> + iwe.u.qual.level = le32_to_cpu(bssid->Rssi);
> + iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
> + | IW_QUAL_LEVEL_UPDATED
> + | IW_QUAL_NOISE_INVALID;
> + cev = iwe_stream_add_event(cev, end_buf, &iwe, IW_EV_QUAL_LEN);
> +
> + devdbg(usbdev, "ENCODE %d", le32_to_cpu(bssid->Privacy));
> + iwe.cmd = SIOCGIWENCODE;
> + iwe.u.data.length = 0;
> + if (le32_to_cpu(bssid->Privacy) == Ndis802_11PrivFilterAcceptAll)
> + iwe.u.data.flags = IW_ENCODE_DISABLED;
> + else
> + iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
> +
> + cev = iwe_stream_add_point(cev, end_buf, &iwe, NULL);
> +
> + devdbg(usbdev, "RATES:");
> + current_val = cev + IW_EV_LCP_LEN;
> + iwe.cmd = SIOCGIWRATE;
> + for (i = 0; i < sizeof(bssid->SupportedRates); i++) {
> + if (bssid->SupportedRates[i] & 0x7f) {
> + iwe.u.bitrate.value =
> + ((bssid->SupportedRates[i] & 0x7f) *
> + 500000);
> + devdbg(usbdev, " %d", iwe.u.bitrate.value);
> + current_val = iwe_stream_add_value(cev,
> + current_val, end_buf, &iwe,
> + IW_EV_PARAM_LEN);
> + }
> + }
> +
> + if ((current_val - cev) > IW_EV_LCP_LEN)
> + cev = current_val;
> +
> + beacon = le32_to_cpu(bssid->Configuration.BeaconPeriod);
> + devdbg(usbdev, "BCN_INT %d", beacon);
> + iwe.cmd = IWEVCUSTOM;
> + snprintf(sbuf, sizeof(sbuf), "bcn_int=%d", beacon);
> + iwe.u.data.length = strlen(sbuf);
> + cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
> +
> + atim = le32_to_cpu(bssid->Configuration.ATIMWindow);
> + devdbg(usbdev, "ATIM %d", atim);
> + iwe.cmd = IWEVCUSTOM;
> + snprintf(sbuf, sizeof(sbuf), "atim=%u", atim);
> + iwe.u.data.length = strlen(sbuf);
> + cev = iwe_stream_add_point(cev, end_buf, &iwe, sbuf);
> +
> + ie = (void *)(bssid->IEs + sizeof(struct NDIS_802_11_FIXED_IEs));
> + ie_len = min(bssid_len - (int)sizeof(*bssid),
> + (int)le32_to_cpu(bssid->IELength));
> + ie_len -= sizeof(struct NDIS_802_11_FIXED_IEs);
> + while (ie_len >= sizeof(*ie) && sizeof(*ie) + ie->len <= ie_len) {
> + if ((ie->id == MFIE_TYPE_GENERIC && ie->len >= 4 &&
> + memcmp(ie->data, "\x00\x50\xf2\x01", 4) == 0) ||
> + ie->id == MFIE_TYPE_RSN) {
> + devdbg(usbdev, "IE: WPA%d",
> + (ie->id == MFIE_TYPE_RSN) ? 2 : 1);
> + iwe.cmd = IWEVGENIE;
> + iwe.u.data.length = min(ie->len + 2, MAX_WPA_IE_LEN);
> + cev = iwe_stream_add_point(cev, end_buf, &iwe,
> + (u8 *)ie);
> + }
> +
> + ie_len -= sizeof(*ie) + ie->len;
> + ie = (struct ieee80211_info_element *)&ie->data[ie->len];
> + }
> +
> + return cev;
> +}
> +
> +
> +static int rndis_iw_get_scan(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + void *buf = NULL;
> + char *cev = extra;
> + struct NDIS_802_11_BSSID_LIST_EX *bssid_list;
> + struct NDIS_WLAN_BSSID_EX *bssid;
> + int ret = -EINVAL, len, count, bssid_len;
> +
> + devdbg(usbdev, "SIOCGIWSCAN");
> +
> + len = CONTROL_BUFFER_SIZE;
> + buf = kmalloc(len, GFP_KERNEL);
> + if (!buf) {
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + ret = rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
> +
> + if (ret != 0)
> + goto out;
> +
> + bssid_list = buf;
> + bssid = bssid_list->Bssid;
> + bssid_len = le32_to_cpu(bssid->Length);
> + count = le32_to_cpu(bssid_list->NumberOfItems);
> + devdbg(usbdev, "SIOCGIWSCAN: %d BSSIDs found", count);
> +
> + while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
> + cev = rndis_translate_scan(dev, cev, extra + IW_SCAN_MAX_DATA,
> + bssid);
> + bssid = (void *)bssid + bssid_len;
> + bssid_len = le32_to_cpu(bssid->Length);
> + count--;
> + }
> +
> +out:
> + wrqu->data.length = cev - extra;
> + wrqu->data.flags = 0;
> + kfree(buf);
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_genie(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + int ret = 0;
> +
> +#ifdef DEBUG
> + int j;
> + u8 *gie = extra;
> + for (j = 0; j < wrqu->data.length; j += 8)
> + devdbg(usbdev,
> + "SIOCSIWGENIE %04x - "
> + "%02x %02x %02x %02x %02x %02x %02x %02x", j,
> + gie[j + 0], gie[j + 1], gie[j + 2], gie[j + 3],
> + gie[j + 4], gie[j + 5], gie[j + 6], gie[j + 7]);
> +#endif
> + /* clear existing IEs */
> + if (priv->wpa_ie_len) {
> + kfree(priv->wpa_ie);
> + priv->wpa_ie_len = 0;
> + }
> +
> + /* set new IEs */
> + priv->wpa_ie = kmalloc(wrqu->data.length, GFP_KERNEL);
> + if (priv->wpa_ie) {
> + priv->wpa_ie_len = wrqu->data.length;
> + memcpy(priv->wpa_ie, extra, priv->wpa_ie_len);
> + } else
> + ret = -ENOMEM;
> + return ret;
> +}
> +
> +
> +static int rndis_iw_get_genie(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + devdbg(usbdev, "SIOCGIWGENIE");
> +
> + if (priv->wpa_ie_len == 0 || priv->wpa_ie == NULL) {
> + wrqu->data.length = 0;
> + return 0;
> + }
> +
> + if (wrqu->data.length < priv->wpa_ie_len)
> + return -E2BIG;
> +
> + wrqu->data.length = priv->wpa_ie_len;
> + memcpy(extra, priv->wpa_ie, priv->wpa_ie_len);
> +
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_rts(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + __le32 tmp;
> + devdbg(usbdev, "SIOCSIWRTS");
> +
> + tmp = cpu_to_le32(wrqu->rts.value);
> + return rndis_set_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp,
> + sizeof(tmp));
> +}
> +
> +
> +static int rndis_iw_get_rts(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + __le32 tmp;
> + int len, ret;
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp, &len);
> + if (ret == 0) {
> + wrqu->rts.value = le32_to_cpu(tmp);
> + wrqu->rts.flags = 1;
> + wrqu->rts.disabled = 0;
> + }
> +
> + devdbg(usbdev, "SIOCGIWRTS: %d", wrqu->rts.value);
> +
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_frag(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + __le32 tmp;
> +
> + devdbg(usbdev, "SIOCSIWFRAG");
> +
> + tmp = cpu_to_le32(wrqu->frag.value);
> + return rndis_set_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
> + sizeof(tmp));
> +}
> +
> +
> +static int rndis_iw_get_frag(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + __le32 tmp;
> + int len, ret;
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
> + &len);
> + if (ret == 0) {
> + wrqu->frag.value = le32_to_cpu(tmp);
> + wrqu->frag.flags = 1;
> + wrqu->frag.disabled = 0;
> + }
> + devdbg(usbdev, "SIOCGIWFRAG: %d", wrqu->frag.value);
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_nick(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + devdbg(usbdev, "SIOCSIWNICK");
> +
> + priv->nick_len = wrqu->data.length;
> + if (priv->nick_len > 32)
> + priv->nick_len = 32;
> +
> + memcpy(priv->nick, extra, priv->nick_len);
> + return 0;
> +}
> +
> +
> +static int rndis_iw_get_nick(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + wrqu->data.flags = 1;
> + wrqu->data.length = priv->nick_len;
> + memcpy(extra, priv->nick, priv->nick_len);
> +
> + devdbg(usbdev, "SIOCGIWNICK: '%s'", priv->nick);
> +
> + return 0;
> +}
> +
> +
> +static int rndis_iw_set_freq(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct NDIS_802_11_CONFIGURATION config;
> + unsigned int dsconfig;
> + int len, ret;
> +
> + /* this OID is valid only when not associated */
> + if (is_associated(usbdev))
> + return 0;
> +
> + dsconfig = 0;
> + if (freq_to_dsconfig(&wrqu->freq, &dsconfig))
> + return -EINVAL;
> +
> + len = sizeof(config);
> + ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
> + if (ret != 0) {
> + devdbg(usbdev, "SIOCSIWFREQ: querying configuration failed");
> + return 0;
> + }
> +
> + config.DSConfig = cpu_to_le32(dsconfig);
> +
> + devdbg(usbdev, "SIOCSIWFREQ: %d * 10^%d", wrqu->freq.m, wrqu->freq.e);
> + return rndis_set_oid(usbdev, OID_802_11_CONFIGURATION, &config,
> + sizeof(config));
> +}
> +
> +
> +static int rndis_iw_get_freq(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct NDIS_802_11_CONFIGURATION config;
> + int len, ret;
> +
> + len = sizeof(config);
> + ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
> + if (ret == 0)
> + dsconfig_to_freq(le32_to_cpu(config.DSConfig), &wrqu->freq);
> +
> + devdbg(usbdev, "SIOCGIWFREQ: %d", wrqu->freq.m);
> + return ret;
> +}
> +
> +
> +static int rndis_iw_get_txpower(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tx_power;
> + int ret = 0, len;
> +
> + if (priv->radio_on) {
> + if (priv->caps & CAP_SUPPORT_TXPOWER) {
> + len = sizeof(tx_power);
> + ret = rndis_query_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
> + &tx_power, &len);
> + if (ret != 0)
> + return ret;
> + } else
> + /* fake incase not supported */
> + tx_power = cpu_to_le32(get_bcm4320_power(priv));
> +
> + wrqu->txpower.flags = IW_TXPOW_MWATT;
> + wrqu->txpower.value = le32_to_cpu(tx_power);
> + wrqu->txpower.disabled = 0;
> + } else {
> + wrqu->txpower.flags = IW_TXPOW_MWATT;
> + wrqu->txpower.value = 0;
> + wrqu->txpower.disabled = 1;
> + }
> +
> + devdbg(usbdev, "SIOCGIWTXPOW: %d", wrqu->txpower.value);
> +
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_txpower(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + __le32 tx_power = 0;
> + int ret = 0;
> +
> + if (!wrqu->txpower.disabled) {
> + if (wrqu->txpower.flags == IW_TXPOW_MWATT)
> + tx_power = cpu_to_le32(wrqu->txpower.value);
> + else { /* wrqu->txpower.flags == IW_TXPOW_DBM */
> + if (wrqu->txpower.value > 20)
> + tx_power = cpu_to_le32(128);
> + else if (wrqu->txpower.value < -43)
> + tx_power = cpu_to_le32(127);
> + else {
> + signed char tmp;
> + tmp = wrqu->txpower.value;
> + tmp = -12 - tmp;
> + tmp <<= 2;
> + tx_power = cpu_to_le32((unsigned char)tmp);
> + }
> + }
> + }
> +
> + devdbg(usbdev, "SIOCSIWTXPOW: %d", le32_to_cpu(tx_power));
> +
> + if (le32_to_cpu(tx_power) != 0) {
> + if (priv->caps & CAP_SUPPORT_TXPOWER) {
> + /* turn radio on first */
> + if (!priv->radio_on)
> + disassociate(usbdev, 1);
> +
> + ret = rndis_set_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
> + &tx_power, sizeof(tx_power));
> + if (ret != 0)
> + ret = -EOPNOTSUPP;
> + return ret;
> + } else {
> + /* txpower unsupported, just turn radio on */
> + if (!priv->radio_on)
> + return disassociate(usbdev, 1);
> + return 0; /* all ready on */
> + }
> + }
> +
> + /* tx_power == 0, turn off radio */
> + return disassociate(usbdev, 0);
> +}
> +
> +
> +static int rndis_iw_get_rate(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + __le32 tmp;
> + int ret, len;
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &tmp, &len);
> + if (ret == 0) {
> + wrqu->bitrate.value = le32_to_cpu(tmp) * 100;
> + wrqu->bitrate.disabled = 0;
> + wrqu->bitrate.flags = 1;
> + }
> + return ret;
> +}
> +
> +
> +static int rndis_iw_set_mlme(struct net_device *dev,
> + struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + struct iw_mlme *mlme = (struct iw_mlme *)extra;
> + unsigned char bssid[ETH_ALEN];
> +
> + get_bssid(usbdev, bssid);
> +
> + if (memcmp(bssid, mlme->addr.sa_data, ETH_ALEN))
> + return -EINVAL;
> +
> + switch (mlme->cmd) {
> + case IW_MLME_DEAUTH:
> + return deauthenticate(usbdev);
> + case IW_MLME_DISASSOC:
> + return disassociate(usbdev, priv->radio_on);
> + default:
> + return -EOPNOTSUPP;
> + }
> +
> + return 0;
> +}
> +
> +
> +static struct iw_statistics *rndis_get_wireless_stats(struct net_device *dev)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&priv->stats_lock, flags);
> + memcpy(&priv->iwstats, &priv->privstats, sizeof(priv->iwstats));
> + spin_unlock_irqrestore(&priv->stats_lock, flags);
> +
> + return &priv->iwstats;
> +}
> +
> +
> +#define IW_IOCTL(x) [(x) - SIOCSIWCOMMIT]
> +static const iw_handler rndis_iw_handler[] =
> +{
> + IW_IOCTL(SIOCSIWCOMMIT) = rndis_iw_commit,
> + IW_IOCTL(SIOCGIWNAME) = rndis_iw_get_name,
> + IW_IOCTL(SIOCSIWFREQ) = rndis_iw_set_freq,
> + IW_IOCTL(SIOCGIWFREQ) = rndis_iw_get_freq,
> + IW_IOCTL(SIOCSIWMODE) = rndis_iw_set_mode,
> + IW_IOCTL(SIOCGIWMODE) = rndis_iw_get_mode,
> + IW_IOCTL(SIOCGIWRANGE) = rndis_iw_get_range,
> + IW_IOCTL(SIOCSIWAP) = rndis_iw_set_bssid,
> + IW_IOCTL(SIOCGIWAP) = rndis_iw_get_bssid,
> + IW_IOCTL(SIOCSIWSCAN) = rndis_iw_set_scan,
> + IW_IOCTL(SIOCGIWSCAN) = rndis_iw_get_scan,
> + IW_IOCTL(SIOCSIWESSID) = rndis_iw_set_essid,
> + IW_IOCTL(SIOCGIWESSID) = rndis_iw_get_essid,
> + IW_IOCTL(SIOCSIWNICKN) = rndis_iw_set_nick,
> + IW_IOCTL(SIOCGIWNICKN) = rndis_iw_get_nick,
> + IW_IOCTL(SIOCGIWRATE) = rndis_iw_get_rate,
> + IW_IOCTL(SIOCSIWRTS) = rndis_iw_set_rts,
> + IW_IOCTL(SIOCGIWRTS) = rndis_iw_get_rts,
> + IW_IOCTL(SIOCSIWFRAG) = rndis_iw_set_frag,
> + IW_IOCTL(SIOCGIWFRAG) = rndis_iw_get_frag,
> + IW_IOCTL(SIOCSIWTXPOW) = rndis_iw_set_txpower,
> + IW_IOCTL(SIOCGIWTXPOW) = rndis_iw_get_txpower,
> + IW_IOCTL(SIOCSIWENCODE) = rndis_iw_set_encode,
> + IW_IOCTL(SIOCSIWENCODEEXT) = rndis_iw_set_encode_ext,
> + IW_IOCTL(SIOCSIWAUTH) = rndis_iw_set_auth,
> + IW_IOCTL(SIOCGIWAUTH) = rndis_iw_get_auth,
> + IW_IOCTL(SIOCSIWGENIE) = rndis_iw_set_genie,
> + IW_IOCTL(SIOCGIWGENIE) = rndis_iw_get_genie,
> + IW_IOCTL(SIOCSIWMLME) = rndis_iw_set_mlme,
> +};
> +
> +static const iw_handler rndis_wext_private_handler[] = {
> +};
> +
> +static const struct iw_priv_args rndis_wext_private_args[] = {
> +};
> +
> +
> +static const struct iw_handler_def rndis_iw_handlers = {
> + .num_standard = ARRAY_SIZE(rndis_iw_handler),
> + .num_private = ARRAY_SIZE(rndis_wext_private_handler),
> + .num_private_args = ARRAY_SIZE(rndis_wext_private_args),
> + .standard = (iw_handler *)rndis_iw_handler,
> + .private = (iw_handler *)rndis_wext_private_handler,
> + .private_args = (struct iw_priv_args *)rndis_wext_private_args,
> + .get_wireless_stats = rndis_get_wireless_stats,
> +};
> +
> +
> +static void rndis_wext_worker(struct work_struct *work)
> +{
> + struct rndis_wext_private *priv =
> + container_of(work, struct rndis_wext_private, work);
> + struct usbnet *usbdev = priv->usbdev;
> + union iwreq_data evt;
> + unsigned char bssid[ETH_ALEN];
> + int ret;
> +
> + if (test_and_clear_bit(WORK_CONNECTION_EVENT, &priv->work_pending)) {
> + ret = get_bssid(usbdev, bssid);
> +
> + if (!ret) {
> + evt.data.flags = 0;
> + evt.data.length = 0;
> + memcpy(evt.ap_addr.sa_data, bssid, ETH_ALEN);
> + wireless_send_event(usbdev->net, SIOCGIWAP, &evt, NULL);
> + }
> + }
> +
> + if (test_and_clear_bit(WORK_SET_MULTICAST_LIST, &priv->work_pending))
> + set_multicast_list(usbdev);
> +}
> +
> +static void rndis_wext_set_multicast_list(struct net_device *dev)
> +{
> + struct usbnet *usbdev = dev->priv;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
> +
> + set_bit(WORK_SET_MULTICAST_LIST, &priv->work_pending);
> + queue_work(priv->workqueue, &priv->work);
> +}
> +
> +static void rndis_wext_link_change(struct usbnet *dev, int state)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> + union iwreq_data evt;
> +
> + if (state) {
> + /* queue work to avoid recursive calls into rndis_command */
> + set_bit(WORK_CONNECTION_EVENT, &priv->work_pending);
> + queue_work(priv->workqueue, &priv->work);
> + } else {
> + evt.data.flags = 0;
> + evt.data.length = 0;
> + memset(evt.ap_addr.sa_data, 0, ETH_ALEN);
> + wireless_send_event(dev->net, SIOCGIWAP, &evt, NULL);
> + }
> +}
> +
> +
> +static int rndis_wext_get_caps(struct usbnet *dev)
> +{
> + struct {
> + __le32 num_items;
> + __le32 items[8];
> + } networks_supported;
> + int len, retval, i, n;
> + __le32 tx_power;
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> +
> + /* determine if supports setting txpower */
> + len = sizeof(tx_power);
> + retval = rndis_query_oid(dev, OID_802_11_TX_POWER_LEVEL, &tx_power,
> + &len);
> + if (retval == 0 && le32_to_cpu(tx_power) != 0xFF)
> + priv->caps |= CAP_SUPPORT_TXPOWER;
> +
> + /* determine supported modes */
> + len = sizeof(networks_supported);
> + retval = rndis_query_oid(dev, OID_802_11_NETWORK_TYPES_SUPPORTED,
> + &networks_supported, &len);
> + if (retval >= 0) {
> + n = le32_to_cpu(networks_supported.num_items);
> + if (n > 8)
> + n = 8;
> + for (i = 0; i < n; i++) {
> + switch (le32_to_cpu(networks_supported.items[i])) {
> + case Ndis802_11FH:
> + case Ndis802_11DS:
> + priv->caps |= CAP_MODE_80211B;
> + break;
> + case Ndis802_11OFDM5:
> + priv->caps |= CAP_MODE_80211A;
> + break;
> + case Ndis802_11OFDM24:
> + priv->caps |= CAP_MODE_80211G;
> + break;
> + }
> + }
> + if (priv->caps & CAP_MODE_80211A)
> + strcat(priv->name, "a");
> + if (priv->caps & CAP_MODE_80211B)
> + strcat(priv->name, "b");
> + if (priv->caps & CAP_MODE_80211G)
> + strcat(priv->name, "g");
> + }
> +
> + return retval;
> +}
> +
> +
> +#define STATS_UPDATE_JIFFIES (HZ)
> +static void rndis_update_wireless_stats(struct work_struct *work)
> +{
> + struct rndis_wext_private *priv =
> + container_of(work, struct rndis_wext_private, stats_work.work);
> + struct usbnet *usbdev = priv->usbdev;
> + struct iw_statistics iwstats;
> + __le32 rssi, tmp;
> + int len, ret, bitrate, j;
> + unsigned long flags;
> + int update_jiffies = STATS_UPDATE_JIFFIES;
> + void *buf;
> +
> + spin_lock_irqsave(&priv->stats_lock, flags);
> + memcpy(&iwstats, &priv->privstats, sizeof(iwstats));
> + spin_unlock_irqrestore(&priv->stats_lock, flags);
> +
> + /* only update stats when connected */
> + if (!is_associated(usbdev)) {
> + iwstats.qual.qual = 0;
> + iwstats.qual.level = 0;
> + iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
> + | IW_QUAL_LEVEL_UPDATED
> + | IW_QUAL_NOISE_INVALID
> + | IW_QUAL_QUAL_INVALID
> + | IW_QUAL_LEVEL_INVALID;
> + goto end;
> + }
> +
> + len = sizeof(rssi);
> + ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
> +
> + devdbg(usbdev, "stats: OID_802_11_RSSI -> %d, rssi:%d", ret,
> + le32_to_cpu(rssi));
> + if (ret == 0) {
> + memset(&iwstats.qual, 0, sizeof(iwstats.qual));
> + iwstats.qual.qual = level_to_qual(le32_to_cpu(rssi));
> + iwstats.qual.level = le32_to_cpu(rssi);
> + iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
> + | IW_QUAL_LEVEL_UPDATED
> + | IW_QUAL_NOISE_INVALID;
> + }
> +
> + memset(&iwstats.discard, 0, sizeof(iwstats.discard));
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_GEN_XMIT_ERROR, &tmp, &len);
> + if (ret == 0)
> + iwstats.discard.misc += le32_to_cpu(tmp);
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_GEN_RCV_ERROR, &tmp, &len);
> + if (ret == 0)
> + iwstats.discard.misc += le32_to_cpu(tmp);
> +
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_GEN_RCV_NO_BUFFER, &tmp, &len);
> + if (ret == 0)
> + iwstats.discard.misc += le32_to_cpu(tmp);
> +
> + /* Workaround transfer stalls on poor quality links. */
> + len = sizeof(tmp);
> + ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &tmp, &len);
> + if (ret == 0) {
> + bitrate = le32_to_cpu(tmp) * 100;
> + if (bitrate > 11000000)
> + goto end;
> +
> + /* Decrease stats worker interval to catch stalls.
> + * faster. Faster than 400-500ms causes packet loss,
> + * Slower doesn't catch stalls fast enough.
> + */
> + j = msecs_to_jiffies(priv->param_workaround_interval);
> + if (j > STATS_UPDATE_JIFFIES)
> + j = STATS_UPDATE_JIFFIES;
> + else if (j <= 0)
> + j = 1;
> + update_jiffies = j;
> +
> + /* Send scan OID. Use of both OIDs is required to get device
> + * working.
> + */
> + tmp = ccpu2(1);
> + rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
> + sizeof(tmp));
> +
> + len = CONTROL_BUFFER_SIZE;
> + buf = kmalloc(len, GFP_KERNEL);
> + if (!buf)
> + goto end;
> +
> + rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
> + kfree(buf);
> + }
> +end:
> + spin_lock_irqsave(&priv->stats_lock, flags);
> + memcpy(&priv->privstats, &iwstats, sizeof(iwstats));
> + spin_unlock_irqrestore(&priv->stats_lock, flags);
> +
> + if (update_jiffies >= HZ)
> + update_jiffies = round_jiffies_relative(update_jiffies);
> + else {
> + j = round_jiffies_relative(update_jiffies);
> + if (abs(j - update_jiffies) <= 10)
> + update_jiffies = j;
> + }
> +
> + queue_delayed_work(priv->workqueue, &priv->stats_work, update_jiffies);
> +}
> +
> +
> +static int bcm4320_early_init(struct usbnet *dev)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> + char buf[8];
> +
> + /* Early initialization settings, setting these won't have effect
> + * if called after generic_rndis_bind().
> + */
> +
> + priv->param_country[0] = modparam_country[0];
> + priv->param_country[1] = modparam_country[1];
> + priv->param_country[2] = 0;
> + priv->param_frameburst = modparam_frameburst;
> + priv->param_afterburner = modparam_afterburner;
> + priv->param_power_save = modparam_power_save;
> + priv->param_power_output = modparam_power_output;
> + priv->param_roamtrigger = modparam_roamtrigger;
> + priv->param_roamdelta = modparam_roamdelta;
> + priv->param_workaround_interval = modparam_workaround_interval;
> +
> + priv->param_country[0] = toupper(priv->param_country[0]);
> + priv->param_country[1] = toupper(priv->param_country[1]);
> + /* doesn't support EU as country code, use FI instead */
> + if (!strcmp(priv->param_country, "EU"))
> + strcpy(priv->param_country, "FI");
> +
> + if (priv->param_power_save < 0)
> + priv->param_power_save = 0;
> + else if (priv->param_power_save > 2)
> + priv->param_power_save = 2;
> +
> + if (priv->param_roamtrigger < -80)
> + priv->param_roamtrigger = -80;
> + else if (priv->param_roamtrigger > -60)
> + priv->param_roamtrigger = -60;
> +
> + if (priv->param_roamdelta < 0)
> + priv->param_roamdelta = 0;
> + else if (priv->param_roamdelta > 2)
> + priv->param_roamdelta = 2;
> +
> + if (priv->param_workaround_interval < 0)
> + priv->param_workaround_interval = 500;
> +
> + rndis_set_config_parameter_str(dev, "Country", priv->param_country);
> + rndis_set_config_parameter_str(dev, "FrameBursting",
> + priv->param_frameburst ? "1" : "0");
> + rndis_set_config_parameter_str(dev, "Afterburner",
> + priv->param_afterburner ? "1" : "0");
> + sprintf(buf, "%d", priv->param_power_save);
> + rndis_set_config_parameter_str(dev, "PowerSaveMode", buf);
> + sprintf(buf, "%d", priv->param_power_output);
> + rndis_set_config_parameter_str(dev, "PwrOut", buf);
> + sprintf(buf, "%d", priv->param_roamtrigger);
> + rndis_set_config_parameter_str(dev, "RoamTrigger", buf);
> + sprintf(buf, "%d", priv->param_roamdelta);
> + rndis_set_config_parameter_str(dev, "RoamDelta", buf);
> +
> + return 0;
> +}
> +
> +
> +static int rndis_wext_bind(struct usbnet *dev, struct usb_interface *intf)
> +{
> + struct net_device *net = dev->net;
> + struct rndis_wext_private *priv;
> + int retval, len;
> + __le32 tmp;
> +
> + /* allocate rndis private data */
> + priv = kmalloc(sizeof(struct rndis_wext_private), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + /* These have to be initialized before calling generic_rndis_bind().
> + * Otherwise we'll be in big trouble in rndis_wext_early_init().
> + */
> + dev->driver_priv = priv;
> + memset(priv, 0, sizeof(*priv));
> + memset(priv->name, 0, sizeof(priv->name));
> + strcpy(priv->name, "IEEE802.11");
> + net->wireless_handlers = &rndis_iw_handlers;
> + priv->usbdev = dev;
> +
> + mutex_init(&priv->command_lock);
> + spin_lock_init(&priv->stats_lock);
> +
> + /* try bind rndis_host */
> + retval = generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_WIRELESS);
> + if (retval < 0)
> + goto fail;
> +
> + /* generic_rndis_bind set packet filter to multicast_all+
> + * promisc mode which doesn't work well for our devices (device
> + * picks up rssi to closest station instead of to access point).
> + *
> + * rndis_host wants to avoid all OID as much as possible
> + * so do promisc/multicast handling in rndis_wext.
> + */
> + dev->net->set_multicast_list = rndis_wext_set_multicast_list;
> + tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
> + retval = rndis_set_oid(dev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
> + sizeof(tmp));
> +
> + len = sizeof(tmp);
> + retval = rndis_query_oid(dev, OID_802_3_MAXIMUM_LIST_SIZE, &tmp, &len);
> + priv->multicast_size = le32_to_cpu(tmp);
> + if (retval < 0 || priv->multicast_size < 0)
> + priv->multicast_size = 0;
> + if (priv->multicast_size > 0)
> + dev->net->flags |= IFF_MULTICAST;
> + else
> + dev->net->flags &= ~IFF_MULTICAST;
> +
> + priv->iwstats.qual.qual = 0;
> + priv->iwstats.qual.level = 0;
> + priv->iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
> + | IW_QUAL_LEVEL_UPDATED
> + | IW_QUAL_NOISE_INVALID
> + | IW_QUAL_QUAL_INVALID
> + | IW_QUAL_LEVEL_INVALID;
> +
> + rndis_wext_get_caps(dev);
> + set_default_iw_params(dev);
> +
> + /* turn radio on */
> + priv->radio_on = 1;
> + disassociate(dev, 1);
> +
> + /* because rndis_command() sleeps we need to use workqueue */
> + priv->workqueue = create_singlethread_workqueue("rndis_wlan");
> + INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats);
> + queue_delayed_work(priv->workqueue, &priv->stats_work,
> + round_jiffies_relative(STATS_UPDATE_JIFFIES));
> + INIT_WORK(&priv->work, rndis_wext_worker);
> +
> + return 0;
> +
> +fail:
> + kfree(priv);
> + return retval;
> +}
> +
> +
> +static void rndis_wext_unbind(struct usbnet *dev, struct usb_interface *intf)
> +{
> + struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
> +
> + /* turn radio off */
> + disassociate(dev, 0);
> +
> + cancel_delayed_work_sync(&priv->stats_work);
> + cancel_work_sync(&priv->work);
> + flush_workqueue(priv->workqueue);
> + destroy_workqueue(priv->workqueue);
> +
> + if (priv && priv->wpa_ie_len)
> + kfree(priv->wpa_ie);
> + kfree(priv);
> +
> + rndis_unbind(dev, intf);
> +}
> +
> +
> +static int rndis_wext_reset(struct usbnet *dev)
> +{
> + return deauthenticate(dev);
> +}
> +
> +
> +static const struct driver_info bcm4320b_info = {
> + .description = "Wireless RNDIS device, BCM4320b based",
> + .flags = FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
> + .bind = rndis_wext_bind,
> + .unbind = rndis_wext_unbind,
> + .status = rndis_status,
> + .rx_fixup = rndis_rx_fixup,
> + .tx_fixup = rndis_tx_fixup,
> + .reset = rndis_wext_reset,
> + .early_init = bcm4320_early_init,
> + .link_change = rndis_wext_link_change,
> +};
> +
> +static const struct driver_info bcm4320a_info = {
> + .description = "Wireless RNDIS device, BCM4320a based",
> + .flags = FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
> + .bind = rndis_wext_bind,
> + .unbind = rndis_wext_unbind,
> + .status = rndis_status,
> + .rx_fixup = rndis_rx_fixup,
> + .tx_fixup = rndis_tx_fixup,
> + .reset = rndis_wext_reset,
> + .early_init = bcm4320_early_init,
> + .link_change = rndis_wext_link_change,
> +};
> +
> +static const struct driver_info rndis_wext_info = {
> + .description = "Wireless RNDIS device",
> + .flags = FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
> + .bind = rndis_wext_bind,
> + .unbind = rndis_wext_unbind,
> + .status = rndis_status,
> + .rx_fixup = rndis_rx_fixup,
> + .tx_fixup = rndis_tx_fixup,
> + .reset = rndis_wext_reset,
> + .early_init = bcm4320_early_init,
> + .link_change = rndis_wext_link_change,
> +};
> +
> +/*-------------------------------------------------------------------------*/
> +
> +static const struct usb_device_id products [] = {
> +#define RNDIS_MASTER_INTERFACE \
> + .bInterfaceClass = USB_CLASS_COMM, \
> + .bInterfaceSubClass = 2 /* ACM */, \
> + .bInterfaceProtocol = 0x0ff
> +
> +/* INF driver for these devices have DriverVer >= 4.xx.xx.xx and many custom
> + * parameters available. Chipset marked as 'BCM4320SKFBG' in NDISwrapper-wiki.
> + */
> +{
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0411,
> + .idProduct = 0x00bc, /* Buffalo WLI-U2-KG125S */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0baf,
> + .idProduct = 0x011b, /* U.S. Robotics USR5421 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x050d,
> + .idProduct = 0x011b, /* Belkin F5D7051 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x1799, /* Belkin has two vendor ids */
> + .idProduct = 0x011b, /* Belkin F5D7051 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x13b1,
> + .idProduct = 0x0014, /* Linksys WUSB54GSv2 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x13b1,
> + .idProduct = 0x0026, /* Linksys WUSB54GSC */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0b05,
> + .idProduct = 0x1717, /* Asus WL169gE */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0a5c,
> + .idProduct = 0xd11b, /* Eminent EM4045 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x1690,
> + .idProduct = 0x0715, /* BT Voyager 1055 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320b_info,
> +},
> +/* These devices have DriverVer < 4.xx.xx.xx and do not have any custom
> + * parameters available, hardware probably contain older firmware version with
> + * no way of updating. Chipset marked as 'BCM4320????' in NDISwrapper-wiki.
> + */
> +{
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x13b1,
> + .idProduct = 0x000e, /* Linksys WUSB54GSv1 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320a_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0baf,
> + .idProduct = 0x0111, /* U.S. Robotics USR5420 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320a_info,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x0411,
> + .idProduct = 0x004b, /* BUFFALO WLI-USB-G54 */
> + RNDIS_MASTER_INTERFACE,
> + .driver_info = (unsigned long) &bcm4320a_info,
> +},
> +/* Generic Wireless RNDIS devices that we don't have exact
> + * idVendor/idProduct/chip yet.
> + */
> +{
> + /* RNDIS is MSFT's un-official variant of CDC ACM */
> + USB_INTERFACE_INFO(USB_CLASS_COMM, 2 /* ACM */, 0x0ff),
> + .driver_info = (unsigned long) &rndis_wext_info,
> +}, {
> + /* "ActiveSync" is an undocumented variant of RNDIS, used in WM5 */
> + USB_INTERFACE_INFO(USB_CLASS_MISC, 1, 1),
> + .driver_info = (unsigned long) &rndis_wext_info,
> +},
> + { }, // END
> +};
> +MODULE_DEVICE_TABLE(usb, products);
> +
> +static struct usb_driver rndis_wlan_driver = {
> + .name = "rndis_wlan",
> + .id_table = products,
> + .probe = usbnet_probe,
> + .disconnect = usbnet_disconnect,
> + .suspend = usbnet_suspend,
> + .resume = usbnet_resume,
> +};
> +
> +static int __init rndis_wlan_init(void)
> +{
> + return usb_register(&rndis_wlan_driver);
> +}
> +module_init(rndis_wlan_init);
> +
> +static void __exit rndis_wlan_exit(void)
> +{
> + usb_deregister(&rndis_wlan_driver);
> +}
> +module_exit(rndis_wlan_exit);
> +
> +MODULE_AUTHOR("Bjorge Dijkstra");
> +MODULE_AUTHOR("Jussi Kivilinna");
> +MODULE_DESCRIPTION("Driver for RNDIS based USB Wireless adapters");
> +MODULE_LICENSE("GPL");
> +
>
^ permalink raw reply
* Re: [PATCH 13/14] Move usbnet.h and rndis_host.h to include/linux/usb
From: David Brownell @ 2008-01-27 16:36 UTC (permalink / raw)
To: Jussi Kivilinna; +Cc: linux-wireless, netdev, bjd
In-Reply-To: <20080125225145.11716.68993.stgit@fate.lan>
On Friday 25 January 2008, Jussi Kivilinna wrote:
> Move headers usbnet.h and rndis_host.h to include/linux/usb and fix includes
> for drivers/net/usb modules. Headers are moved because rndis_wlan will be
> outside drivers/net/usb in drivers/net/wireless and yet need these headers.
>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
> ---
>
> drivers/net/usb/asix.c | 3
> drivers/net/usb/cdc_ether.c | 3
> drivers/net/usb/cdc_subset.c | 3
> drivers/net/usb/dm9601.c | 3
> drivers/net/usb/gl620a.c | 3
> drivers/net/usb/mcs7830.c | 3
> drivers/net/usb/net1080.c | 3
> drivers/net/usb/plusb.c | 3
> drivers/net/usb/rndis_host.c | 5 -
> drivers/net/usb/rndis_host.h | 274 ----------------------------------------
> drivers/net/usb/usbnet.c | 3
> drivers/net/usb/usbnet.h | 214 -------------------------------
> drivers/net/usb/zaurus.c | 3
> include/linux/usb/rndis_host.h | 274 ++++++++++++++++++++++++++++++++++++++++
> include/linux/usb/usbnet.h | 214 +++++++++++++++++++++++++++++++
> 15 files changed, 500 insertions(+), 511 deletions(-)
>
> diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
> index 569028b..6f245cf 100644
> --- a/drivers/net/usb/asix.c
> +++ b/drivers/net/usb/asix.c
> @@ -33,8 +33,7 @@
> #include <linux/mii.h>
> #include <linux/usb.h>
> #include <linux/crc32.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
> #define DRIVER_VERSION "14-Jun-2006"
> static const char driver_name [] = "asix";
> diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
> index 97c17bb..a934428 100644
> --- a/drivers/net/usb/cdc_ether.c
> +++ b/drivers/net/usb/cdc_ether.c
> @@ -31,8 +31,7 @@
> #include <linux/mii.h>
> #include <linux/usb.h>
> #include <linux/usb/cdc.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
>
> #if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
> diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
> index 943988e..0ec7936 100644
> --- a/drivers/net/usb/cdc_subset.c
> +++ b/drivers/net/usb/cdc_subset.c
> @@ -26,8 +26,7 @@
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> #include <linux/usb.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
>
> /*
> diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
> index 1ffdd10..5a4e40c 100644
> --- a/drivers/net/usb/dm9601.c
> +++ b/drivers/net/usb/dm9601.c
> @@ -20,8 +20,7 @@
> #include <linux/mii.h>
> #include <linux/usb.h>
> #include <linux/crc32.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
> /* datasheet:
> http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf
> diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c
> index 031cf5c..f7ccfad 100644
> --- a/drivers/net/usb/gl620a.c
> +++ b/drivers/net/usb/gl620a.c
> @@ -29,8 +29,7 @@
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> #include <linux/usb.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
>
> /*
> diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
> index 5ea7411..c3d119f 100644
> --- a/drivers/net/usb/mcs7830.c
> +++ b/drivers/net/usb/mcs7830.c
> @@ -31,8 +31,7 @@
> #include <linux/module.h>
> #include <linux/netdevice.h>
> #include <linux/usb.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
> /* requests */
> #define MCS7830_RD_BMREQ (USB_DIR_IN | USB_TYPE_VENDOR | \
> diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
> index 19bf8da..034e8a7 100644
> --- a/drivers/net/usb/net1080.c
> +++ b/drivers/net/usb/net1080.c
> @@ -28,11 +28,10 @@
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> #include <linux/usb.h>
> +#include <linux/usb/usbnet.h>
>
> #include <asm/unaligned.h>
>
> -#include "usbnet.h"
> -
>
> /*
> * Netchip 1080 driver ... http://www.netchip.com
> diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
> index 4530093..08555f8 100644
> --- a/drivers/net/usb/plusb.c
> +++ b/drivers/net/usb/plusb.c
> @@ -28,8 +28,7 @@
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> #include <linux/usb.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
>
> /*
> diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
> index 825ff51..411314e 100644
> --- a/drivers/net/usb/rndis_host.c
> +++ b/drivers/net/usb/rndis_host.c
> @@ -29,9 +29,8 @@
> #include <linux/mii.h>
> #include <linux/usb.h>
> #include <linux/usb/cdc.h>
> -
> -#include "usbnet.h"
> -#include "rndis_host.h"
> +#include <linux/usb/usbnet.h>
> +#include <linux/usb/rndis_host.h>
>
>
> /*
> diff --git a/drivers/net/usb/rndis_host.h b/drivers/net/usb/rndis_host.h
> deleted file mode 100644
> index edc1d4a..0000000
> --- a/drivers/net/usb/rndis_host.h
> +++ /dev/null
> @@ -1,274 +0,0 @@
> -/*
> - * Host Side support for RNDIS Networking Links
> - * Copyright (C) 2005 by David Brownell
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> - */
> -
> -
> -#ifndef __RNDIS_HOST_H
> -#define __RNDIS_HOST_H
> -
> -
> -/*
> - * CONTROL uses CDC "encapsulated commands" with funky notifications.
> - * - control-out: SEND_ENCAPSULATED
> - * - interrupt-in: RESPONSE_AVAILABLE
> - * - control-in: GET_ENCAPSULATED
> - *
> - * We'll try to ignore the RESPONSE_AVAILABLE notifications.
> - *
> - * REVISIT some RNDIS implementations seem to have curious issues still
> - * to be resolved.
> - */
> -struct rndis_msg_hdr {
> - __le32 msg_type; /* RNDIS_MSG_* */
> - __le32 msg_len;
> - // followed by data that varies between messages
> - __le32 request_id;
> - __le32 status;
> - // ... and more
> -} __attribute__ ((packed));
> -
> -/* MS-Windows uses this strange size, but RNDIS spec says 1024 minimum */
> -#define CONTROL_BUFFER_SIZE 1025
> -
> -/* RNDIS defines an (absurdly huge) 10 second control timeout,
> - * but ActiveSync seems to use a more usual 5 second timeout
> - * (which matches the USB 2.0 spec).
> - */
> -#define RNDIS_CONTROL_TIMEOUT_MS (5 * 1000)
> -
> -
> -#define ccpu2 __constant_cpu_to_le32
> -
> -#define RNDIS_MSG_COMPLETION ccpu2(0x80000000)
> -
> -/* codes for "msg_type" field of rndis messages;
> - * only the data channel uses packet messages (maybe batched);
> - * everything else goes on the control channel.
> - */
> -#define RNDIS_MSG_PACKET ccpu2(0x00000001) /* 1-N packets */
> -#define RNDIS_MSG_INIT ccpu2(0x00000002)
> -#define RNDIS_MSG_INIT_C (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
> -#define RNDIS_MSG_HALT ccpu2(0x00000003)
> -#define RNDIS_MSG_QUERY ccpu2(0x00000004)
> -#define RNDIS_MSG_QUERY_C (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
> -#define RNDIS_MSG_SET ccpu2(0x00000005)
> -#define RNDIS_MSG_SET_C (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
> -#define RNDIS_MSG_RESET ccpu2(0x00000006)
> -#define RNDIS_MSG_RESET_C (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
> -#define RNDIS_MSG_INDICATE ccpu2(0x00000007)
> -#define RNDIS_MSG_KEEPALIVE ccpu2(0x00000008)
> -#define RNDIS_MSG_KEEPALIVE_C (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
> -
> -/* codes for "status" field of completion messages */
> -#define RNDIS_STATUS_SUCCESS ccpu2(0x00000000)
> -#define RNDIS_STATUS_FAILURE ccpu2(0xc0000001)
> -#define RNDIS_STATUS_INVALID_DATA ccpu2(0xc0010015)
> -#define RNDIS_STATUS_NOT_SUPPORTED ccpu2(0xc00000bb)
> -#define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b)
> -#define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c)
> -
> -/* codes for OID_GEN_PHYSICAL_MEDIUM */
> -#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED ccpu2(0x00000000)
> -#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN ccpu2(0x00000001)
> -#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM ccpu2(0x00000002)
> -#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE ccpu2(0x00000003)
> -#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE ccpu2(0x00000004)
> -#define RNDIS_PHYSICAL_MEDIUM_DSL ccpu2(0x00000005)
> -#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL ccpu2(0x00000006)
> -#define RNDIS_PHYSICAL_MEDIUM_1394 ccpu2(0x00000007)
> -#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN ccpu2(0x00000008)
> -#define RNDIS_PHYSICAL_MEDIUM_MAX ccpu2(0x00000009)
> -
> -struct rndis_data_hdr {
> - __le32 msg_type; /* RNDIS_MSG_PACKET */
> - __le32 msg_len; // rndis_data_hdr + data_len + pad
> - __le32 data_offset; // 36 -- right after header
> - __le32 data_len; // ... real packet size
> -
> - __le32 oob_data_offset; // zero
> - __le32 oob_data_len; // zero
> - __le32 num_oob; // zero
> - __le32 packet_data_offset; // zero
> -
> - __le32 packet_data_len; // zero
> - __le32 vc_handle; // zero
> - __le32 reserved; // zero
> -} __attribute__ ((packed));
> -
> -struct rndis_init { /* OUT */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_INIT */
> - __le32 msg_len; // 24
> - __le32 request_id;
> - __le32 major_version; // of rndis (1.0)
> - __le32 minor_version;
> - __le32 max_transfer_size;
> -} __attribute__ ((packed));
> -
> -struct rndis_init_c { /* IN */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_INIT_C */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 status;
> - __le32 major_version; // of rndis (1.0)
> - __le32 minor_version;
> - __le32 device_flags;
> - __le32 medium; // zero == 802.3
> - __le32 max_packets_per_message;
> - __le32 max_transfer_size;
> - __le32 packet_alignment; // max 7; (1<<n) bytes
> - __le32 af_list_offset; // zero
> - __le32 af_list_size; // zero
> -} __attribute__ ((packed));
> -
> -struct rndis_halt { /* OUT (no reply) */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_HALT */
> - __le32 msg_len;
> - __le32 request_id;
> -} __attribute__ ((packed));
> -
> -struct rndis_query { /* OUT */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_QUERY */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 oid;
> - __le32 len;
> - __le32 offset;
> -/*?*/ __le32 handle; // zero
> -} __attribute__ ((packed));
> -
> -struct rndis_query_c { /* IN */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_QUERY_C */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 status;
> - __le32 len;
> - __le32 offset;
> -} __attribute__ ((packed));
> -
> -struct rndis_set { /* OUT */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_SET */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 oid;
> - __le32 len;
> - __le32 offset;
> -/*?*/ __le32 handle; // zero
> -} __attribute__ ((packed));
> -
> -struct rndis_set_c { /* IN */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_SET_C */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 status;
> -} __attribute__ ((packed));
> -
> -struct rndis_reset { /* IN */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_RESET */
> - __le32 msg_len;
> - __le32 reserved;
> -} __attribute__ ((packed));
> -
> -struct rndis_reset_c { /* OUT */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_RESET_C */
> - __le32 msg_len;
> - __le32 status;
> - __le32 addressing_lost;
> -} __attribute__ ((packed));
> -
> -struct rndis_indicate { /* IN (unrequested) */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_INDICATE */
> - __le32 msg_len;
> - __le32 status;
> - __le32 length;
> - __le32 offset;
> -/**/ __le32 diag_status;
> - __le32 error_offset;
> -/**/ __le32 message;
> -} __attribute__ ((packed));
> -
> -struct rndis_keepalive { /* OUT (optionally IN) */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_KEEPALIVE */
> - __le32 msg_len;
> - __le32 request_id;
> -} __attribute__ ((packed));
> -
> -struct rndis_keepalive_c { /* IN (optionally OUT) */
> - // header and:
> - __le32 msg_type; /* RNDIS_MSG_KEEPALIVE_C */
> - __le32 msg_len;
> - __le32 request_id;
> - __le32 status;
> -} __attribute__ ((packed));
> -
> -/* NOTE: about 30 OIDs are "mandatory" for peripherals to support ... and
> - * there are gobs more that may optionally be supported. We'll avoid as much
> - * of that mess as possible.
> - */
> -#define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
> -#define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106)
> -#define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e)
> -#define OID_GEN_PHYSICAL_MEDIUM ccpu2(0x00010202)
> -
> -/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
> -#define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001)
> -#define RNDIS_PACKET_TYPE_MULTICAST ccpu2(0x00000002)
> -#define RNDIS_PACKET_TYPE_ALL_MULTICAST ccpu2(0x00000004)
> -#define RNDIS_PACKET_TYPE_BROADCAST ccpu2(0x00000008)
> -#define RNDIS_PACKET_TYPE_SOURCE_ROUTING ccpu2(0x00000010)
> -#define RNDIS_PACKET_TYPE_PROMISCUOUS ccpu2(0x00000020)
> -#define RNDIS_PACKET_TYPE_SMT ccpu2(0x00000040)
> -#define RNDIS_PACKET_TYPE_ALL_LOCAL ccpu2(0x00000080)
> -#define RNDIS_PACKET_TYPE_GROUP ccpu2(0x00001000)
> -#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL ccpu2(0x00002000)
> -#define RNDIS_PACKET_TYPE_FUNCTIONAL ccpu2(0x00004000)
> -#define RNDIS_PACKET_TYPE_MAC_FRAME ccpu2(0x00008000)
> -
> -/* default filter used with RNDIS devices */
> -#define RNDIS_DEFAULT_FILTER ( \
> - RNDIS_PACKET_TYPE_DIRECTED | \
> - RNDIS_PACKET_TYPE_BROADCAST | \
> - RNDIS_PACKET_TYPE_ALL_MULTICAST | \
> - RNDIS_PACKET_TYPE_PROMISCUOUS)
> -
> -/* Flags to require specific physical medium type for generic_rndis_bind() */
> -#define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001
> -#define FLAG_RNDIS_PHYM_WIRELESS 0x0002
> -
> -
> -extern void rndis_status(struct usbnet *dev, struct urb *urb);
> -extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
> -extern int
> -generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
> -extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
> -extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb);
> -extern struct sk_buff *
> -rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags);
> -
> -#endif /* __RNDIS_HOST_H */
> -
> diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
> index a2a2d5e..8463efb 100644
> --- a/drivers/net/usb/usbnet.c
> +++ b/drivers/net/usb/usbnet.c
> @@ -41,8 +41,7 @@
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> #include <linux/usb.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
> #define DRIVER_VERSION "22-Aug-2005"
>
> diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h
> deleted file mode 100644
> index e0501da..0000000
> --- a/drivers/net/usb/usbnet.h
> +++ /dev/null
> @@ -1,214 +0,0 @@
> -/*
> - * USB Networking Link Interface
> - *
> - * Copyright (C) 2000-2005 by David Brownell <dbrownell@users.sourceforge.net>
> - * Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> - */
> -
> -
> -#ifndef __USBNET_H
> -#define __USBNET_H
> -
> -
> -/* interface from usbnet core to each USB networking link we handle */
> -struct usbnet {
> - /* housekeeping */
> - struct usb_device *udev;
> - struct usb_interface *intf;
> - struct driver_info *driver_info;
> - const char *driver_name;
> - void *driver_priv;
> - wait_queue_head_t *wait;
> - struct mutex phy_mutex;
> - unsigned char suspend_count;
> -
> - /* i/o info: pipes etc */
> - unsigned in, out;
> - struct usb_host_endpoint *status;
> - unsigned maxpacket;
> - struct timer_list delay;
> -
> - /* protocol/interface state */
> - struct net_device *net;
> - struct net_device_stats stats;
> - int msg_enable;
> - unsigned long data [5];
> - u32 xid;
> - u32 hard_mtu; /* count any extra framing */
> - size_t rx_urb_size; /* size for rx urbs */
> - struct mii_if_info mii;
> -
> - /* various kinds of pending driver work */
> - struct sk_buff_head rxq;
> - struct sk_buff_head txq;
> - struct sk_buff_head done;
> - struct urb *interrupt;
> - struct tasklet_struct bh;
> -
> - struct work_struct kevent;
> - unsigned long flags;
> -# define EVENT_TX_HALT 0
> -# define EVENT_RX_HALT 1
> -# define EVENT_RX_MEMORY 2
> -# define EVENT_STS_SPLIT 3
> -# define EVENT_LINK_RESET 4
> -};
> -
> -static inline struct usb_driver *driver_of(struct usb_interface *intf)
> -{
> - return to_usb_driver(intf->dev.driver);
> -}
> -
> -/* interface from the device/framing level "minidriver" to core */
> -struct driver_info {
> - char *description;
> -
> - int flags;
> -/* framing is CDC Ethernet, not writing ZLPs (hw issues), or optionally: */
> -#define FLAG_FRAMING_NC 0x0001 /* guard against device dropouts */
> -#define FLAG_FRAMING_GL 0x0002 /* genelink batches packets */
> -#define FLAG_FRAMING_Z 0x0004 /* zaurus adds a trailer */
> -#define FLAG_FRAMING_RN 0x0008 /* RNDIS batches, plus huge header */
> -
> -#define FLAG_NO_SETINT 0x0010 /* device can't set_interface() */
> -#define FLAG_ETHER 0x0020 /* maybe use "eth%d" names */
> -
> -#define FLAG_FRAMING_AX 0x0040 /* AX88772/178 packets */
> -#define FLAG_WLAN 0x0080 /* use "wlan%d" names */
> -
> -
> - /* init device ... can sleep, or cause probe() failure */
> - int (*bind)(struct usbnet *, struct usb_interface *);
> -
> - /* cleanup device ... can sleep, but can't fail */
> - void (*unbind)(struct usbnet *, struct usb_interface *);
> -
> - /* reset device ... can sleep */
> - int (*reset)(struct usbnet *);
> -
> - /* see if peer is connected ... can sleep */
> - int (*check_connect)(struct usbnet *);
> -
> - /* for status polling */
> - void (*status)(struct usbnet *, struct urb *);
> -
> - /* link reset handling, called from defer_kevent */
> - int (*link_reset)(struct usbnet *);
> -
> - /* fixup rx packet (strip framing) */
> - int (*rx_fixup)(struct usbnet *dev, struct sk_buff *skb);
> -
> - /* fixup tx packet (add framing) */
> - struct sk_buff *(*tx_fixup)(struct usbnet *dev,
> - struct sk_buff *skb, gfp_t flags);
> -
> - /* early initialization code, can sleep. This is for minidrivers
> - * having 'subminidrivers' that need to do extra initialization
> - * right after minidriver have initialized hardware. */
> - int (*early_init)(struct usbnet *dev);
> -
> - /* called by minidriver when link state changes, state: 0=disconnect,
> - * 1=connect */
> - void (*link_change)(struct usbnet *dev, int state);
> -
> - /* for new devices, use the descriptor-reading code instead */
> - int in; /* rx endpoint */
> - int out; /* tx endpoint */
> -
> - unsigned long data; /* Misc driver specific data */
> -};
> -
> -/* Minidrivers are just drivers using the "usbnet" core as a powerful
> - * network-specific subroutine library ... that happens to do pretty
> - * much everything except custom framing and chip-specific stuff.
> - */
> -extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
> -extern int usbnet_suspend (struct usb_interface *, pm_message_t );
> -extern int usbnet_resume (struct usb_interface *);
> -extern void usbnet_disconnect(struct usb_interface *);
> -
> -
> -/* Drivers that reuse some of the standard USB CDC infrastructure
> - * (notably, using multiple interfaces according to the CDC
> - * union descriptor) get some helper code.
> - */
> -struct cdc_state {
> - struct usb_cdc_header_desc *header;
> - struct usb_cdc_union_desc *u;
> - struct usb_cdc_ether_desc *ether;
> - struct usb_interface *control;
> - struct usb_interface *data;
> -};
> -
> -extern int usbnet_generic_cdc_bind (struct usbnet *, struct usb_interface *);
> -extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
> -
> -/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
> -#define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \
> - |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
> - |USB_CDC_PACKET_TYPE_PROMISCUOUS \
> - |USB_CDC_PACKET_TYPE_DIRECTED)
> -
> -
> -/* we record the state for each of our queued skbs */
> -enum skb_state {
> - illegal = 0,
> - tx_start, tx_done,
> - rx_start, rx_done, rx_cleanup
> -};
> -
> -struct skb_data { /* skb->cb is one of these */
> - struct urb *urb;
> - struct usbnet *dev;
> - enum skb_state state;
> - size_t length;
> -};
> -
> -
> -extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
> -extern void usbnet_defer_kevent (struct usbnet *, int);
> -extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
> -extern void usbnet_unlink_rx_urbs(struct usbnet *);
> -
> -extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
> -extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
> -extern u32 usbnet_get_link (struct net_device *net);
> -extern u32 usbnet_get_msglevel (struct net_device *);
> -extern void usbnet_set_msglevel (struct net_device *, u32);
> -extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
> -extern int usbnet_nway_reset(struct net_device *net);
> -
> -/* messaging support includes the interface name, so it must not be
> - * used before it has one ... notably, in minidriver bind() calls.
> - */
> -#ifdef DEBUG
> -#define devdbg(usbnet, fmt, arg...) \
> - printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> -#else
> -#define devdbg(usbnet, fmt, arg...) do {} while(0)
> -#endif
> -
> -#define deverr(usbnet, fmt, arg...) \
> - printk(KERN_ERR "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> -#define devwarn(usbnet, fmt, arg...) \
> - printk(KERN_WARNING "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> -
> -#define devinfo(usbnet, fmt, arg...) \
> - printk(KERN_INFO "%s: " fmt "\n" , (usbnet)->net->name , ## arg); \
> -
> -
> -#endif /* __USBNET_H */
> diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
> index 9f98e8c..e24f7b3 100644
> --- a/drivers/net/usb/zaurus.c
> +++ b/drivers/net/usb/zaurus.c
> @@ -29,8 +29,7 @@
> #include <linux/crc32.h>
> #include <linux/usb.h>
> #include <linux/usb/cdc.h>
> -
> -#include "usbnet.h"
> +#include <linux/usb/usbnet.h>
>
>
> /*
> diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
> new file mode 100644
> index 0000000..edc1d4a
> --- /dev/null
> +++ b/include/linux/usb/rndis_host.h
> @@ -0,0 +1,274 @@
> +/*
> + * Host Side support for RNDIS Networking Links
> + * Copyright (C) 2005 by David Brownell
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +
> +#ifndef __RNDIS_HOST_H
> +#define __RNDIS_HOST_H
> +
> +
> +/*
> + * CONTROL uses CDC "encapsulated commands" with funky notifications.
> + * - control-out: SEND_ENCAPSULATED
> + * - interrupt-in: RESPONSE_AVAILABLE
> + * - control-in: GET_ENCAPSULATED
> + *
> + * We'll try to ignore the RESPONSE_AVAILABLE notifications.
> + *
> + * REVISIT some RNDIS implementations seem to have curious issues still
> + * to be resolved.
> + */
> +struct rndis_msg_hdr {
> + __le32 msg_type; /* RNDIS_MSG_* */
> + __le32 msg_len;
> + // followed by data that varies between messages
> + __le32 request_id;
> + __le32 status;
> + // ... and more
> +} __attribute__ ((packed));
> +
> +/* MS-Windows uses this strange size, but RNDIS spec says 1024 minimum */
> +#define CONTROL_BUFFER_SIZE 1025
> +
> +/* RNDIS defines an (absurdly huge) 10 second control timeout,
> + * but ActiveSync seems to use a more usual 5 second timeout
> + * (which matches the USB 2.0 spec).
> + */
> +#define RNDIS_CONTROL_TIMEOUT_MS (5 * 1000)
> +
> +
> +#define ccpu2 __constant_cpu_to_le32
> +
> +#define RNDIS_MSG_COMPLETION ccpu2(0x80000000)
> +
> +/* codes for "msg_type" field of rndis messages;
> + * only the data channel uses packet messages (maybe batched);
> + * everything else goes on the control channel.
> + */
> +#define RNDIS_MSG_PACKET ccpu2(0x00000001) /* 1-N packets */
> +#define RNDIS_MSG_INIT ccpu2(0x00000002)
> +#define RNDIS_MSG_INIT_C (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
> +#define RNDIS_MSG_HALT ccpu2(0x00000003)
> +#define RNDIS_MSG_QUERY ccpu2(0x00000004)
> +#define RNDIS_MSG_QUERY_C (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
> +#define RNDIS_MSG_SET ccpu2(0x00000005)
> +#define RNDIS_MSG_SET_C (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
> +#define RNDIS_MSG_RESET ccpu2(0x00000006)
> +#define RNDIS_MSG_RESET_C (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
> +#define RNDIS_MSG_INDICATE ccpu2(0x00000007)
> +#define RNDIS_MSG_KEEPALIVE ccpu2(0x00000008)
> +#define RNDIS_MSG_KEEPALIVE_C (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
> +
> +/* codes for "status" field of completion messages */
> +#define RNDIS_STATUS_SUCCESS ccpu2(0x00000000)
> +#define RNDIS_STATUS_FAILURE ccpu2(0xc0000001)
> +#define RNDIS_STATUS_INVALID_DATA ccpu2(0xc0010015)
> +#define RNDIS_STATUS_NOT_SUPPORTED ccpu2(0xc00000bb)
> +#define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b)
> +#define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c)
> +
> +/* codes for OID_GEN_PHYSICAL_MEDIUM */
> +#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED ccpu2(0x00000000)
> +#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN ccpu2(0x00000001)
> +#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM ccpu2(0x00000002)
> +#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE ccpu2(0x00000003)
> +#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE ccpu2(0x00000004)
> +#define RNDIS_PHYSICAL_MEDIUM_DSL ccpu2(0x00000005)
> +#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL ccpu2(0x00000006)
> +#define RNDIS_PHYSICAL_MEDIUM_1394 ccpu2(0x00000007)
> +#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN ccpu2(0x00000008)
> +#define RNDIS_PHYSICAL_MEDIUM_MAX ccpu2(0x00000009)
> +
> +struct rndis_data_hdr {
> + __le32 msg_type; /* RNDIS_MSG_PACKET */
> + __le32 msg_len; // rndis_data_hdr + data_len + pad
> + __le32 data_offset; // 36 -- right after header
> + __le32 data_len; // ... real packet size
> +
> + __le32 oob_data_offset; // zero
> + __le32 oob_data_len; // zero
> + __le32 num_oob; // zero
> + __le32 packet_data_offset; // zero
> +
> + __le32 packet_data_len; // zero
> + __le32 vc_handle; // zero
> + __le32 reserved; // zero
> +} __attribute__ ((packed));
> +
> +struct rndis_init { /* OUT */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_INIT */
> + __le32 msg_len; // 24
> + __le32 request_id;
> + __le32 major_version; // of rndis (1.0)
> + __le32 minor_version;
> + __le32 max_transfer_size;
> +} __attribute__ ((packed));
> +
> +struct rndis_init_c { /* IN */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_INIT_C */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 status;
> + __le32 major_version; // of rndis (1.0)
> + __le32 minor_version;
> + __le32 device_flags;
> + __le32 medium; // zero == 802.3
> + __le32 max_packets_per_message;
> + __le32 max_transfer_size;
> + __le32 packet_alignment; // max 7; (1<<n) bytes
> + __le32 af_list_offset; // zero
> + __le32 af_list_size; // zero
> +} __attribute__ ((packed));
> +
> +struct rndis_halt { /* OUT (no reply) */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_HALT */
> + __le32 msg_len;
> + __le32 request_id;
> +} __attribute__ ((packed));
> +
> +struct rndis_query { /* OUT */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_QUERY */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 oid;
> + __le32 len;
> + __le32 offset;
> +/*?*/ __le32 handle; // zero
> +} __attribute__ ((packed));
> +
> +struct rndis_query_c { /* IN */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_QUERY_C */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 status;
> + __le32 len;
> + __le32 offset;
> +} __attribute__ ((packed));
> +
> +struct rndis_set { /* OUT */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_SET */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 oid;
> + __le32 len;
> + __le32 offset;
> +/*?*/ __le32 handle; // zero
> +} __attribute__ ((packed));
> +
> +struct rndis_set_c { /* IN */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_SET_C */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 status;
> +} __attribute__ ((packed));
> +
> +struct rndis_reset { /* IN */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_RESET */
> + __le32 msg_len;
> + __le32 reserved;
> +} __attribute__ ((packed));
> +
> +struct rndis_reset_c { /* OUT */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_RESET_C */
> + __le32 msg_len;
> + __le32 status;
> + __le32 addressing_lost;
> +} __attribute__ ((packed));
> +
> +struct rndis_indicate { /* IN (unrequested) */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_INDICATE */
> + __le32 msg_len;
> + __le32 status;
> + __le32 length;
> + __le32 offset;
> +/**/ __le32 diag_status;
> + __le32 error_offset;
> +/**/ __le32 message;
> +} __attribute__ ((packed));
> +
> +struct rndis_keepalive { /* OUT (optionally IN) */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_KEEPALIVE */
> + __le32 msg_len;
> + __le32 request_id;
> +} __attribute__ ((packed));
> +
> +struct rndis_keepalive_c { /* IN (optionally OUT) */
> + // header and:
> + __le32 msg_type; /* RNDIS_MSG_KEEPALIVE_C */
> + __le32 msg_len;
> + __le32 request_id;
> + __le32 status;
> +} __attribute__ ((packed));
> +
> +/* NOTE: about 30 OIDs are "mandatory" for peripherals to support ... and
> + * there are gobs more that may optionally be supported. We'll avoid as much
> + * of that mess as possible.
> + */
> +#define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
> +#define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106)
> +#define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e)
> +#define OID_GEN_PHYSICAL_MEDIUM ccpu2(0x00010202)
> +
> +/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
> +#define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001)
> +#define RNDIS_PACKET_TYPE_MULTICAST ccpu2(0x00000002)
> +#define RNDIS_PACKET_TYPE_ALL_MULTICAST ccpu2(0x00000004)
> +#define RNDIS_PACKET_TYPE_BROADCAST ccpu2(0x00000008)
> +#define RNDIS_PACKET_TYPE_SOURCE_ROUTING ccpu2(0x00000010)
> +#define RNDIS_PACKET_TYPE_PROMISCUOUS ccpu2(0x00000020)
> +#define RNDIS_PACKET_TYPE_SMT ccpu2(0x00000040)
> +#define RNDIS_PACKET_TYPE_ALL_LOCAL ccpu2(0x00000080)
> +#define RNDIS_PACKET_TYPE_GROUP ccpu2(0x00001000)
> +#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL ccpu2(0x00002000)
> +#define RNDIS_PACKET_TYPE_FUNCTIONAL ccpu2(0x00004000)
> +#define RNDIS_PACKET_TYPE_MAC_FRAME ccpu2(0x00008000)
> +
> +/* default filter used with RNDIS devices */
> +#define RNDIS_DEFAULT_FILTER ( \
> + RNDIS_PACKET_TYPE_DIRECTED | \
> + RNDIS_PACKET_TYPE_BROADCAST | \
> + RNDIS_PACKET_TYPE_ALL_MULTICAST | \
> + RNDIS_PACKET_TYPE_PROMISCUOUS)
> +
> +/* Flags to require specific physical medium type for generic_rndis_bind() */
> +#define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001
> +#define FLAG_RNDIS_PHYM_WIRELESS 0x0002
> +
> +
> +extern void rndis_status(struct usbnet *dev, struct urb *urb);
> +extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
> +extern int
> +generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
> +extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
> +extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb);
> +extern struct sk_buff *
> +rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags);
> +
> +#endif /* __RNDIS_HOST_H */
> +
> diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
> new file mode 100644
> index 0000000..e0501da
> --- /dev/null
> +++ b/include/linux/usb/usbnet.h
> @@ -0,0 +1,214 @@
> +/*
> + * USB Networking Link Interface
> + *
> + * Copyright (C) 2000-2005 by David Brownell <dbrownell@users.sourceforge.net>
> + * Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +
> +#ifndef __USBNET_H
> +#define __USBNET_H
> +
> +
> +/* interface from usbnet core to each USB networking link we handle */
> +struct usbnet {
> + /* housekeeping */
> + struct usb_device *udev;
> + struct usb_interface *intf;
> + struct driver_info *driver_info;
> + const char *driver_name;
> + void *driver_priv;
> + wait_queue_head_t *wait;
> + struct mutex phy_mutex;
> + unsigned char suspend_count;
> +
> + /* i/o info: pipes etc */
> + unsigned in, out;
> + struct usb_host_endpoint *status;
> + unsigned maxpacket;
> + struct timer_list delay;
> +
> + /* protocol/interface state */
> + struct net_device *net;
> + struct net_device_stats stats;
> + int msg_enable;
> + unsigned long data [5];
> + u32 xid;
> + u32 hard_mtu; /* count any extra framing */
> + size_t rx_urb_size; /* size for rx urbs */
> + struct mii_if_info mii;
> +
> + /* various kinds of pending driver work */
> + struct sk_buff_head rxq;
> + struct sk_buff_head txq;
> + struct sk_buff_head done;
> + struct urb *interrupt;
> + struct tasklet_struct bh;
> +
> + struct work_struct kevent;
> + unsigned long flags;
> +# define EVENT_TX_HALT 0
> +# define EVENT_RX_HALT 1
> +# define EVENT_RX_MEMORY 2
> +# define EVENT_STS_SPLIT 3
> +# define EVENT_LINK_RESET 4
> +};
> +
> +static inline struct usb_driver *driver_of(struct usb_interface *intf)
> +{
> + return to_usb_driver(intf->dev.driver);
> +}
> +
> +/* interface from the device/framing level "minidriver" to core */
> +struct driver_info {
> + char *description;
> +
> + int flags;
> +/* framing is CDC Ethernet, not writing ZLPs (hw issues), or optionally: */
> +#define FLAG_FRAMING_NC 0x0001 /* guard against device dropouts */
> +#define FLAG_FRAMING_GL 0x0002 /* genelink batches packets */
> +#define FLAG_FRAMING_Z 0x0004 /* zaurus adds a trailer */
> +#define FLAG_FRAMING_RN 0x0008 /* RNDIS batches, plus huge header */
> +
> +#define FLAG_NO_SETINT 0x0010 /* device can't set_interface() */
> +#define FLAG_ETHER 0x0020 /* maybe use "eth%d" names */
> +
> +#define FLAG_FRAMING_AX 0x0040 /* AX88772/178 packets */
> +#define FLAG_WLAN 0x0080 /* use "wlan%d" names */
> +
> +
> + /* init device ... can sleep, or cause probe() failure */
> + int (*bind)(struct usbnet *, struct usb_interface *);
> +
> + /* cleanup device ... can sleep, but can't fail */
> + void (*unbind)(struct usbnet *, struct usb_interface *);
> +
> + /* reset device ... can sleep */
> + int (*reset)(struct usbnet *);
> +
> + /* see if peer is connected ... can sleep */
> + int (*check_connect)(struct usbnet *);
> +
> + /* for status polling */
> + void (*status)(struct usbnet *, struct urb *);
> +
> + /* link reset handling, called from defer_kevent */
> + int (*link_reset)(struct usbnet *);
> +
> + /* fixup rx packet (strip framing) */
> + int (*rx_fixup)(struct usbnet *dev, struct sk_buff *skb);
> +
> + /* fixup tx packet (add framing) */
> + struct sk_buff *(*tx_fixup)(struct usbnet *dev,
> + struct sk_buff *skb, gfp_t flags);
> +
> + /* early initialization code, can sleep. This is for minidrivers
> + * having 'subminidrivers' that need to do extra initialization
> + * right after minidriver have initialized hardware. */
> + int (*early_init)(struct usbnet *dev);
> +
> + /* called by minidriver when link state changes, state: 0=disconnect,
> + * 1=connect */
> + void (*link_change)(struct usbnet *dev, int state);
> +
> + /* for new devices, use the descriptor-reading code instead */
> + int in; /* rx endpoint */
> + int out; /* tx endpoint */
> +
> + unsigned long data; /* Misc driver specific data */
> +};
> +
> +/* Minidrivers are just drivers using the "usbnet" core as a powerful
> + * network-specific subroutine library ... that happens to do pretty
> + * much everything except custom framing and chip-specific stuff.
> + */
> +extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
> +extern int usbnet_suspend (struct usb_interface *, pm_message_t );
> +extern int usbnet_resume (struct usb_interface *);
> +extern void usbnet_disconnect(struct usb_interface *);
> +
> +
> +/* Drivers that reuse some of the standard USB CDC infrastructure
> + * (notably, using multiple interfaces according to the CDC
> + * union descriptor) get some helper code.
> + */
> +struct cdc_state {
> + struct usb_cdc_header_desc *header;
> + struct usb_cdc_union_desc *u;
> + struct usb_cdc_ether_desc *ether;
> + struct usb_interface *control;
> + struct usb_interface *data;
> +};
> +
> +extern int usbnet_generic_cdc_bind (struct usbnet *, struct usb_interface *);
> +extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
> +
> +/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
> +#define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \
> + |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
> + |USB_CDC_PACKET_TYPE_PROMISCUOUS \
> + |USB_CDC_PACKET_TYPE_DIRECTED)
> +
> +
> +/* we record the state for each of our queued skbs */
> +enum skb_state {
> + illegal = 0,
> + tx_start, tx_done,
> + rx_start, rx_done, rx_cleanup
> +};
> +
> +struct skb_data { /* skb->cb is one of these */
> + struct urb *urb;
> + struct usbnet *dev;
> + enum skb_state state;
> + size_t length;
> +};
> +
> +
> +extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
> +extern void usbnet_defer_kevent (struct usbnet *, int);
> +extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
> +extern void usbnet_unlink_rx_urbs(struct usbnet *);
> +
> +extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
> +extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
> +extern u32 usbnet_get_link (struct net_device *net);
> +extern u32 usbnet_get_msglevel (struct net_device *);
> +extern void usbnet_set_msglevel (struct net_device *, u32);
> +extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
> +extern int usbnet_nway_reset(struct net_device *net);
> +
> +/* messaging support includes the interface name, so it must not be
> + * used before it has one ... notably, in minidriver bind() calls.
> + */
> +#ifdef DEBUG
> +#define devdbg(usbnet, fmt, arg...) \
> + printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> +#else
> +#define devdbg(usbnet, fmt, arg...) do {} while(0)
> +#endif
> +
> +#define deverr(usbnet, fmt, arg...) \
> + printk(KERN_ERR "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> +#define devwarn(usbnet, fmt, arg...) \
> + printk(KERN_WARNING "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
> +
> +#define devinfo(usbnet, fmt, arg...) \
> + printk(KERN_INFO "%s: " fmt "\n" , (usbnet)->net->name , ## arg); \
> +
> +
> +#endif /* __USBNET_H */
>
^ permalink raw reply
* Re: [PATCH 10/14] [rndis_host] Add early_init function pointer to 'struct rndis_data'.
From: David Brownell @ 2008-01-27 16:14 UTC (permalink / raw)
To: Jussi Kivilinna; +Cc: linux-wireless, netdev, bjd
In-Reply-To: <20080125225128.11716.59998.stgit@fate.lan>
On Friday 25 January 2008, Jussi Kivilinna wrote:
> Function pointer is for 'subminidrivers' that need to do work on device
> right after minidriver has initialized hardware.
>
> For example, rndis_wlan setting device specific configuration parameters
> with OID_GEN_RNDIS_CONFIG_PARAMETER right after rndis_host has
> initialized hardware with RNDIS_INIT.
>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
... though I'm not sure I'd coin a term like "subminidriver". ;)
> ---
>
> drivers/net/usb/rndis_host.c | 6 ++++++
> drivers/net/usb/usbnet.h | 5 +++++
> 2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
> index 1d6bf0a..0813903 100644
> --- a/drivers/net/usb/rndis_host.c
> +++ b/drivers/net/usb/rndis_host.c
> @@ -336,6 +336,12 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
> dev->hard_mtu, tmp, dev->rx_urb_size,
> 1 << le32_to_cpu(u.init_c->packet_alignment));
>
> + /* module has some device initialization code needs to be done right
> + * after RNDIS_INIT */
> + if (dev->driver_info->early_init &&
> + dev->driver_info->early_init(dev) != 0)
> + goto halt_fail_and_release;
> +
> /* Get designated host ethernet address */
> reply_len = ETH_ALEN;
> retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
> diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h
> index 0b4bf09..25b63d3 100644
> --- a/drivers/net/usb/usbnet.h
> +++ b/drivers/net/usb/usbnet.h
> @@ -116,6 +116,11 @@ struct driver_info {
> struct sk_buff *(*tx_fixup)(struct usbnet *dev,
> struct sk_buff *skb, gfp_t flags);
>
> + /* early initialization code, can sleep. This is for minidrivers
> + * having 'subminidrivers' that need to do extra initialization
> + * right after minidriver have initialized hardware. */
> + int (*early_init)(struct usbnet *dev);
> +
> /* for new devices, use the descriptor-reading code instead */
> int in; /* rx endpoint */
> int out; /* tx endpoint */
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox