On Fri, 27 Apr 2007 17:10:17 +0200, Johannes Berg wrote: > --- wireless-dev.orig/net/mac80211/ieee80211.c 2007-04-27 12:03:38.334987898 +0200 > +++ wireless-dev/net/mac80211/ieee80211.c 2007-04-27 12:03:43.034987898 +0200 > @@ -255,21 +255,32 @@ int ieee80211_get_hdrlen(u16 fc) > > switch (fc & IEEE80211_FCTL_FTYPE) { > case IEEE80211_FTYPE_DATA: > - if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) > + if (unlikely((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))) This is not unlikely if you have a WDS link set up. I wouldn't change the condition. Jiri -- Jiri Benc SUSE Labs - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html