On Mon, Dec 7, 2009 at 06:49, Neil Horman <[email protected]> wrote: > Update xgb driver to not allow dma beyond the end of the allocated skb > > Signed-off-by: Neil Horman <[email protected]> > > ixgb_main.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c > index bcd0f01..2d8e699 100644 > --- a/drivers/net/ixgb/ixgb_main.c > +++ b/drivers/net/ixgb/ixgb_main.c > @@ -798,14 +798,19 @@ ixgb_setup_rctl(struct ixgb_adapter *adapter) > > rctl |= IXGB_RCTL_SECRC; > > - if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048) > + if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048) { > rctl |= IXGB_RCTL_BSIZE_2048; > - else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096) > + adapter->rx_buffer_len = IXGB_RXBUFFER_2048; > + } else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096) { > rctl |= IXGB_RCTL_BSIZE_4096; > - else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192) > + adapter->rx_buffer_len = IXGB_RXBUFFER_4096; > + } else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192) { > rctl |= IXGB_RCTL_BSIZE_8192; > - else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384) > + adapter->rx_buffer_len = IXGB_RXBUFFER_8192; > + } else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384) { > rctl |= IXGB_RCTL_BSIZE_16384; > + adapter->rx_buffer_len = IXGB_RXBUFFER_16384; > + } > > IXGB_WRITE_REG(&adapter->hw, RCTL, rctl); > } > --
I have added this patch to my queue of ixgb patches for reveiw/testing. Upon successful review/testing I will submit to Dave/netdev. -- Cheers, Jeff ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ E1000-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/e1000-devel
