diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:40 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:45 +0200 |
| commit | a43e61842ec55baa486d60eed2a19af67ba78b9f (patch) | |
| tree | 6c3c93f19e3933273b73b9edd16edc146ab18527 /drivers/s390/net/qeth_core_mpc.c | |
| parent | 5d473fedd17ae3a9f92fb35551e307d01459ea6a (diff) | |
| parent | 50dffe7fad6c156c2928e45c19ff7b86eb951f4c (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
This brings in commit 7a7c0a6438b8 ("mac80211: fix TX aggregation
start/stop callback race") to allow the follow-up cleanup.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/s390/net/qeth_core_mpc.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_mpc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/net/qeth_core_mpc.c b/drivers/s390/net/qeth_core_mpc.c index beb4bdc26de5..ab9b1376467f 100644 --- a/drivers/s390/net/qeth_core_mpc.c +++ b/drivers/s390/net/qeth_core_mpc.c @@ -167,6 +167,8 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { {IPA_RC_IP_TABLE_FULL, "Add Addr IP Table Full - ipv6"}, {IPA_RC_UNKNOWN_ERROR, "IPA command failed - reason unknown"}, {IPA_RC_UNSUPPORTED_COMMAND, "Command not supported"}, + {IPA_RC_TRACE_ALREADY_ACTIVE, "trace already active"}, + {IPA_RC_INVALID_FORMAT, "invalid format or length"}, {IPA_RC_DUP_IPV6_REMOTE, "ipv6 address already registered remote"}, {IPA_RC_DUP_IPV6_HOME, "ipv6 address already registered"}, {IPA_RC_UNREGISTERED_ADDR, "Address not registered"}, |