diff options
| author | Scott Feldman <sfeldma@gmail.com> | 2015-06-11 20:20:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 15:57:17 +0200 |
| commit | e9fdaec0e0d40f548c2b79e147c7ffd2809d2a64 (patch) | |
| tree | 0f64fa084a34b501ec84856d8d71f440ba519eba /net | |
| parent | Merge branch 'switchdev-vlan' (diff) | |
| download | linux-e9fdaec0e0d40f548c2b79e147c7ffd2809d2a64.tar.xz linux-e9fdaec0e0d40f548c2b79e147c7ffd2809d2a64.zip | |
switchdev: change BUG_ON to WARN for attr set failure case
This particular BUG_ON condition was checking for attr set err in the
COMMIT phase, which isn't expected (it's a driver bug if PREPARE phase is
OK but COMMIT fails). But BUG_ON() is too strong for this case, so change
to WARN(). BUG_ON() would be warranted if the system was corrupted beyond
repair, but this is not the case here.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/switchdev/switchdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 3e4b35a0c8cb..f01d34075749 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -184,7 +184,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) attr->trans = SWITCHDEV_TRANS_COMMIT; err = __switchdev_port_attr_set(dev, attr); - BUG_ON(err); + WARN(err, "%s: Commit of attribute (id=%d) failed.\n", + dev->name, attr->id); return err; } |