From 8c2fafe0773a6e994a4db055b7d791a8dd470cf1 Mon Sep 17 00:00:00 2001 From: John Fastabend Date: Thu, 6 Oct 2011 08:52:38 +0000 Subject: [PATCH] --- yaml --- r: 266452 b: refs/heads/master c: 6bd0e1cb10b6d14dda4a8806d0a2f4f0bbf01931 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/dcbnl.h | 1 + trunk/net/dcb/dcbnl.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f9f6a419d800..736b261f60e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e290ed81307ca7d92675f0d9c683add693c2f377 +refs/heads/master: 6bd0e1cb10b6d14dda4a8806d0a2f4f0bbf01931 diff --git a/trunk/include/net/dcbnl.h b/trunk/include/net/dcbnl.h index 263aa3ae76f5..2cd66d0be348 100644 --- a/trunk/include/net/dcbnl.h +++ b/trunk/include/net/dcbnl.h @@ -26,6 +26,7 @@ struct dcb_app_type { int ifindex; struct dcb_app app; struct list_head list; + u8 dcbx; }; int dcb_setapp(struct net_device *, struct dcb_app *); diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c index e508593d589b..9bfbc1d1b50c 100644 --- a/trunk/net/dcb/dcbnl.c +++ b/trunk/net/dcb/dcbnl.c @@ -2075,6 +2075,8 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new) event.ifindex = dev->ifindex; memcpy(&event.app, new, sizeof(event.app)); + if (dev->dcbnl_ops->getdcbx) + event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and replace */ @@ -2152,6 +2154,8 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new) event.ifindex = dev->ifindex; memcpy(&event.app, new, sizeof(event.app)); + if (dev->dcbnl_ops->getdcbx) + event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and abort if found */ @@ -2196,6 +2200,8 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del) event.ifindex = dev->ifindex; memcpy(&event.app, del, sizeof(event.app)); + if (dev->dcbnl_ops->getdcbx) + event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and remove it. */