From 39d2039de758c6e968b478453891ced1da5094cd Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Tue, 21 Jun 2011 07:34:58 +0000
Subject: [PATCH] --- yaml --- r: 255660 b: refs/heads/master c:
 ab6baf980b095c70a56c5eb2f58166aef8a0edc8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/dcbnl.h | 2 +-
 trunk/net/dcb/dcbnl.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b5a8944c81f9..9f1dbd628014 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a364c8cf80251849bab207be8c9e66253c8ca8f8
+refs/heads/master: ab6baf980b095c70a56c5eb2f58166aef8a0edc8
diff --git a/trunk/include/net/dcbnl.h b/trunk/include/net/dcbnl.h
index c14fd9483e46..d5bbb7977577 100644
--- a/trunk/include/net/dcbnl.h
+++ b/trunk/include/net/dcbnl.h
@@ -28,7 +28,7 @@ struct dcb_app_type {
 	struct list_head  list;
 };
 
-u8 dcb_setapp(struct net_device *, struct dcb_app *);
+int dcb_setapp(struct net_device *, struct dcb_app *);
 u8 dcb_getapp(struct net_device *, struct dcb_app *);
 int dcb_ieee_setapp(struct net_device *, struct dcb_app *);
 int dcb_ieee_delapp(struct net_device *, struct dcb_app *);
diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c
index b7d0be01dcc4..f54c784e2b5b 100644
--- a/trunk/net/dcb/dcbnl.c
+++ b/trunk/net/dcb/dcbnl.c
@@ -1885,7 +1885,7 @@ EXPORT_SYMBOL(dcb_getapp);
  * removes applications from the app list if the priority is
  * set to zero.
  */
-u8 dcb_setapp(struct net_device *dev, struct dcb_app *new)
+int dcb_setapp(struct net_device *dev, struct dcb_app *new)
 {
 	struct dcb_app_type *itr;
 	struct dcb_app_type event;