Skip to content
  • Herbert Xu's avatar
    GRO: Move netpoll checks to correct location · d1c76af9
    Herbert Xu authored
    
    
    As my netpoll fix for net doesn't really work for net-next, we
    need this update to move the checks into the right place.  As it
    stands we may pass freed skbs to netpoll_receive_skb.
    
    This patch also introduces a netpoll_rx_on function to avoid GRO
    completely if we're invoked through netpoll.  This might seem
    paranoid but as netpoll may have an external receive hook it's
    better to be safe than sorry.  I don't think we need this for
    2.6.29 though since there's nothing immediately broken by it.
    
    This patch also moves the GRO_* return values to netdevice.h since
    VLAN needs them too (I tried to avoid this originally but alas
    this seems to be the easiest way out).  This fixes a bug in VLAN
    where it continued to use the old return value 2 instead of the
    correct GRO_DROP.
    
    Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    d1c76af9