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

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:  
Subject: Re: kern/183727: commit references a PR
Date: Tue, 10 Dec 2013 19:12:24 +0000 (UTC)

 Author: gavin
 Date: Tue Dec 10 19:12:16 2013
 New Revision: 259184
 URL: http://svnweb.freebsd.org/changeset/base/259184
 
 Log:
   Merge r259172 from stable/10 (head r257754 by adrian):
   
     Don't return ENOBUFS if the transmit path handles the frame but queues
     it (eg in power save.)
   
   PR:          kern/183727
   Approved by: re (glebius)
 
 Modified:
   releng/10.0/sys/net80211/ieee80211_output.c
 Directory Properties:
   releng/10.0/   (props changed)
 
 Modified: releng/10.0/sys/net80211/ieee80211_output.c
 ==============================================================================
 --- releng/10.0/sys/net80211/ieee80211_output.c        Tue Dec 10 18:18:39 
2013        (r259183)
 +++ releng/10.0/sys/net80211/ieee80211_output.c        Tue Dec 10 19:12:16 
2013        (r259184)
 @@ -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-...@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
 
_______________________________________________
freebsd-wireless@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-wireless
To unsubscribe, send any mail to "freebsd-wireless-unsubscr...@freebsd.org"

Reply via email to