diff options
| author |   Joel Stanley <joel@jms.id.au> | 2017-07-25 10:19:01 +0930 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-25 21:21:44 -0700 |
| commit | 6cee9d649cd1824a4d9ce6940dd716f2bf2ef24f (patch) | |
| tree | e885c6f6a78ff16d35e8595c393a407376371961 /drivers/net/ethernet/faraday/ftgmac100.c | |
| parent | ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment() (diff) | |
| download | linux-dev-6cee9d649cd1824a4d9ce6940dd716f2bf2ef24f.tar.xz linux-dev-6cee9d649cd1824a4d9ce6940dd716f2bf2ef24f.zip | |
ftgmac100: return error in ftgmac100_alloc_rx_buf
The error paths set err, but it's not returned.
I wondered if we should fix all of the callers to check the returned
value, but Ben explains why the code is this way:
> Most call sites ignore it on purpose. There's nothing we can do if
> we fail to get a buffer at interrupt time, so we point the buffer to
> the scratch page so the HW doesn't DMA into lalaland and lose the
> packet.
>
> The one call site that tests and can fail is the one used when brining
> the interface up. If we fail to allocate at that point, we fail the
> ifup. But as you noticed, I do have a bug not returning the error.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday/ftgmac100.c')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index cdb979440ca5..34dae51effd4 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -392,7 +392,7 @@ static int ftgmac100_alloc_rx_buf(struct ftgmac100 *priv, unsigned int entry, struct net_device *netdev = priv->netdev; struct sk_buff *skb; dma_addr_t map; - int err; + int err = 0; skb = netdev_alloc_skb_ip_align(netdev, RX_BUF_SIZE); if (unlikely(!skb)) { @@ -428,7 +428,7 @@ static int ftgmac100_alloc_rx_buf(struct ftgmac100 *priv, unsigned int entry, else rxdes->rxdes0 = 0; - return 0; + return err; } static unsigned int ftgmac100_next_rx_pointer(struct ftgmac100 *priv, |