Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3517c5b7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-ethernet-Mark-expected-switch-fall-throughs' 



Gustavo A. R. Silva says:

====================
net: ethernet: Mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, this patchset aims
to add some annotations in order to mark switch cases where we are
expecting to fall through.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 541ad323 e38c2e11

drivers/net/ethernet/8390/axnet_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
    switch (cmd) {

    case SIOCGMIIPHY:

	data->phy_id = info->phy_id;

	/* Fall through */

    case SIOCGMIIREG:		/* Read MII PHY register. */

	data->val_out = mdio_read(mii_addr, data->phy_id, data->reg_num & 0x1f);

	return 0;

drivers/net/ethernet/alteon/acenic.c

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ static int acenic_probe_one(struct pci_dev *pdev, 
			       ap->name);

			break;

		}

		/* Fall through */

	case PCI_VENDOR_ID_SGI:

		printk(KERN_INFO "%s: SGI AceNIC ", ap->name);

		break;

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -1729,8 +1729,8 @@ static int bnxt_async_event_process(struct bnxt *bp, 
					    speed);

		}

		set_bit(BNXT_LINK_SPEED_CHNG_SP_EVENT, &bp->sp_event);

		/* fall through */

	}

	/* fall through */

	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE:

		set_bit(BNXT_LINK_CHNG_SP_EVENT, &bp->sp_event);

		break;

drivers/net/ethernet/cadence/macb_ptp.c

+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd) 
	case HWTSTAMP_TX_ONESTEP_SYNC:

		if (gem_ptp_set_one_step_sync(bp, 1) != 0)

			return -ERANGE;

		/* fall through */

	case HWTSTAMP_TX_ON:

		tx_bd_control = TSTAMP_ALL_FRAMES;

		break;

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2209,6 +2209,7 @@ static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
	case SIOCSHWTSTAMP:

		if (lio->oct_dev->ptp_enable)

			return hwtstamp_ioctl(netdev, ifr);

		/* fall through */

	default:

		return -EOPNOTSUPP;

	}