kern/144642: commit references a PR

[dfilter service]

The following reply was made to PR kern/144642; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/144642: commit references a PR
Date: Wed, 22 Jun 2011 09:16:42 +0000 (UTC)

 Author: kevlo
 Date: Wed Jun 22 09:16:32 2011
 New Revision: 223420
 URL: http://svn.freebsd.org/changeset/base/223420
 
 Log:
   MFC r221199:
   Guard against default ni_chan
   
   PR:	kern/144642
   Submitted by:	Arthur Hartwig <a_hartwig at fastmaildot fm>
 
 Modified:
   stable/8/sys/dev/usb/wlan/if_rum.c
 
 Modified: stable/8/sys/dev/usb/wlan/if_rum.c
 ==============================================================================
 --- stable/8/sys/dev/usb/wlan/if_rum.c	Wed Jun 22 08:55:00 2011	(r223419)
 +++ stable/8/sys/dev/usb/wlan/if_rum.c	Wed Jun 22 09:16:32 2011	(r223420)
 @@ -207,7 +207,7 @@ static void		rum_init(void *);
  static void		rum_stop(struct rum_softc *);
  static void		rum_load_microcode(struct rum_softc *, const uint8_t *,
  			    size_t);
 -static int		rum_prepare_beacon(struct rum_softc *,
 +static void		rum_prepare_beacon(struct rum_softc *,
  			    struct ieee80211vap *);
  static int		rum_raw_xmit(struct ieee80211_node *, struct mbuf *,
  			    const struct ieee80211_bpf_params *);
 @@ -2118,7 +2118,7 @@ rum_load_microcode(struct rum_softc *sc,
  	rum_pause(sc, hz / 8);
  }
  
 -static int
 +static void
  rum_prepare_beacon(struct rum_softc *sc, struct ieee80211vap *vap)
  {
  	struct ieee80211com *ic = vap->iv_ic;
 @@ -2126,9 +2126,12 @@ rum_prepare_beacon(struct rum_softc *sc,
  	struct rum_tx_desc desc;
  	struct mbuf *m0;
  
 +	if (vap->iv_bss->ni_chan == IEEE80211_CHAN_ANYC)
 +		return;
 +
  	m0 = ieee80211_beacon_alloc(vap->iv_bss, &RUM_VAP(vap)->bo);
  	if (m0 == NULL) {
 -		return ENOBUFS;
 +		return;
  	}
  
  	tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_bsschan)];
 @@ -2143,8 +2146,6 @@ rum_prepare_beacon(struct rum_softc *sc,
  	    m0->m_pkthdr.len);
  
  	m_freem(m0);
 -
 -	return 0;
  }
  
  static int
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"