diff options
| author | Thomas Gleixner <[email protected]> | 2015-09-30 19:20:39 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2015-09-30 19:20:39 +0000 |
| commit | 09907ca630047bbeaa96de0102df7a6cc3a966cd (patch) | |
| tree | 99e2155ea7b87ebdbeea96b7165d55ad0413006d /net/atm/clip.c | |
| parent | x86/apic: Deinline various functions (diff) | |
| parent | x86/x2apic: Make stub functions available even if !CONFIG_X86_LOCAL_APIC (diff) | |
| download | kernel-09907ca630047bbeaa96de0102df7a6cc3a966cd.tar.gz kernel-09907ca630047bbeaa96de0102df7a6cc3a966cd.zip | |
Merge branch 'x86/for-kvm' into x86/apic
Pull in the apic change which is provided for kvm folks to pull into
their tree.
Diffstat (limited to 'net/atm/clip.c')
| -rw-r--r-- | net/atm/clip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 17e55dfecbe2..e07f551a863c 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -317,6 +317,9 @@ static int clip_constructor(struct neighbour *neigh) static int clip_encap(struct atm_vcc *vcc, int mode) { + if (!CLIP_VCC(vcc)) + return -EBADFD; + CLIP_VCC(vcc)->encap = mode; return 0; } |