---

yaml
---
r: 98574
b: refs/heads/master
c: 15ea0eb
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aebb6a849cfe7d89bcacaaecc20a480dfc1180e7
+refs/heads/master: 15ea0ebc5b7305cc75189cb6b7924d0db5278e0c

trunk/drivers/net/wireless/hostap/hostap_80211_rx.c

@@ -551,7 +551,7 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
 	     hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff ||
 	     hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) {
 		/* RA (or BSSID) is not ours - drop */
-		PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with "
+		PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with "
 		       "not own or broadcast %s=%s\n",
 		       local->dev->name,
 		       fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID",

trunk/lib/ts_bm.c

@@ -63,7 +63,7 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state)
 	struct ts_bm *bm = ts_config_priv(conf);
 	unsigned int i, text_len, consumed = state->offset;
 	const u8 *text;
-	int shift = bm->patlen - 1, bs;
+	int shift = bm->patlen, bs;
 
 	for (;;) {
 		text_len = conf->get_next_block(consumed, &text, conf, state);

trunk/net/netfilter/nf_conntrack_proto_tcp.c

@@ -331,13 +331,12 @@ static unsigned int get_conntrack_index(const struct tcphdr *tcph)
 
    I.   Upper bound for valid data:	seq <= sender.td_maxend
    II.  Lower bound for valid data:	seq + len >= sender.td_end - receiver.td_maxwin
-   III.	Upper bound for valid (s)ack:   sack <= receiver.td_end
-   IV.	Lower bound for valid (s)ack:	sack >= receiver.td_end - MAXACKWINDOW
+   III.	Upper bound for valid ack:      sack <= receiver.td_end
+   IV.	Lower bound for valid ack:	ack >= receiver.td_end - MAXACKWINDOW
 
-   where sack is the highest right edge of sack block found in the packet
-   or ack in the case of packet without SACK option.
+   where sack is the highest right edge of sack block found in the packet.
 
-   The upper bound limit for a valid (s)ack is not ignored -
+   The upper bound limit for a valid ack is not ignored -
    we doesn't have to deal with fragments.
 */
 
@@ -607,12 +606,12 @@ static bool tcp_in_window(const struct nf_conn *ct,
 		 before(seq, sender->td_maxend + 1),
 		 after(end, sender->td_end - receiver->td_maxwin - 1),
 		 before(sack, receiver->td_end + 1),
-		 after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1));
+		 after(ack, receiver->td_end - MAXACKWINDOW(sender)));
 
 	if (before(seq, sender->td_maxend + 1) &&
 	    after(end, sender->td_end - receiver->td_maxwin - 1) &&
 	    before(sack, receiver->td_end + 1) &&
-	    after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) {
+	    after(ack, receiver->td_end - MAXACKWINDOW(sender))) {
 		/*
 		 * Take into account window scaling (RFC 1323).
 		 */