diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-08-19 13:03:46 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-08-19 13:03:46 -0700 |
| commit | 8fef8c7121222233075a03d57db7e0b48d5f6be5 (patch) | |
| tree | 5cb9822a490c41694be2c8af80ec6a5300ad7a28 /datapath/dp_sysfs.h | |
| parent | d2cd45db48e2713b74c3a31f746f923a72294e46 (diff) | |
| parent | 6dd3fad481b5d801695c2b0529c7d37cac2c9b19 (diff) | |
Merge citrix into master.
This was a somewhat difficult merge since there was a fair amount of
superficially divergent development on the two branches, especially in the
datapath.
This has been build-tested against XenServer 5.5.0 and XenServer 5.7.0
build 15122. It has been booted and connected to XenCenter on 5.5.0.
The merge revealed a couple of outstanding bugs, which will be fixed on
citrix and then merged back into master.
Diffstat (limited to 'datapath/dp_sysfs.h')
| -rw-r--r-- | datapath/dp_sysfs.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/datapath/dp_sysfs.h b/datapath/dp_sysfs.h index c0ac01b95..be044eaf2 100644 --- a/datapath/dp_sysfs.h +++ b/datapath/dp_sysfs.h @@ -20,16 +20,7 @@ int dp_sysfs_del_dp(struct datapath *dp); int dp_sysfs_add_if(struct net_bridge_port *p); int dp_sysfs_del_if(struct net_bridge_port *p); -#include <linux/version.h> -#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18) -#define SUPPORT_SYSFS 1 -#else -/* We only support sysfs on Linux 2.6.18 because that's the only place we - * really need it (on Xen, for brcompat) and it's a big pain to try to support - * multiple versions. */ -#endif - -#ifdef SUPPORT_SYSFS +#ifdef CONFIG_SYSFS extern struct sysfs_ops brport_sysfs_ops; #endif |