kern/183727: commit references a PR

[dfilter service]

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

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/183727: commit references a PR
Date: Tue, 10 Dec 2013 13:35:13 +0000 (UTC)

 Author: gavin
 Date: Tue Dec 10 13:35:04 2013
 New Revision: 259172
 URL: http://svnweb.freebsd.org/changeset/base/259172
 
 Log:
   Merge r257754 (by adrian) from head:
   
     Don't return ENOBUFS if the transmit path handles the frame but queues
     it (eg in power save.)
   
   10.0 candidate.
   
   PR:		kern/183727
 
 Modified:
   stable/10/sys/net80211/ieee80211_output.c
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/sys/net80211/ieee80211_output.c
 ==============================================================================
 --- stable/10/sys/net80211/ieee80211_output.c	Tue Dec 10 13:34:28 2013	(r259171)
 +++ stable/10/sys/net80211/ieee80211_output.c	Tue Dec 10 13:35:04 2013	(r259172)
 @@ -143,8 +143,12 @@ ieee80211_vap_pkt_send_dest(struct ieee8
  		 */
  		(void) ieee80211_pwrsave(ni, m);
  		ieee80211_free_node(ni);
 -		/* XXX better status? */
 -		return (ENOBUFS);
 +
 +		/*
 +		 * We queued it fine, so tell the upper layer
 +		 * that we consumed it.
 +		 */
 +		return (0);
  	}
  	/* calculate priority so drivers can find the tx queue */
  	if (ieee80211_classify(ni, m)) {
 @@ -155,8 +159,9 @@ ieee80211_vap_pkt_send_dest(struct ieee8
  		ifp->if_oerrors++;
  		m_freem(m);
  		ieee80211_free_node(ni);
 +
  		/* XXX better status? */
 -		return (ENOBUFS);
 +		return (0);
  	}
  	/*
  	 * Stash the node pointer.  Note that we do this after
 @@ -168,7 +173,6 @@ ieee80211_vap_pkt_send_dest(struct ieee8
  
  	BPF_MTAP(ifp, m);		/* 802.3 tx */
  
 -
  	/*
  	 * Check if A-MPDU tx aggregation is setup or if we
  	 * should try to enable it.  The sta must be associated
 _______________________________________________
 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"