[PATCH 3/3] Phonet: declare headers

[PATCH 3/3] Phonet: declare headers

[Remi Denis-Courmont]

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 include/linux/Kbuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index b68ec09..f431e40 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -126,6 +126,7 @@ header-y += pci_regs.h
 header-y += pfkeyv2.h
 header-y += pg.h
 header-y += phantom.h
+header-y += phonet.h
 header-y += pkt_cls.h
 header-y += pkt_sched.h
 header-y += posix_types.h
@@ -232,6 +233,7 @@ unifdef-y += if_fddi.h
 unifdef-y += if_frad.h
 unifdef-y += if_ltalk.h
 unifdef-y += if_link.h
+unifdef-y += if_phonet.h
 unifdef-y += if_pppol2tp.h
 unifdef-y += if_pppox.h
 unifdef-y += if_tr.h
-- 
1.5.4.3

Re: [PATCH 3/3] Phonet: declare headers

[David Miller]

From: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Wed, 24 Sep 2008 19:11:40 +0300

> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied.

I took a look and noticed that if_phonet.h needs some top-level
ifdef multiple inclusion protection.

Re: [PATCH 3/3] Phonet: declare headers

[Rémi Denis-Courmont]

On Tuesday 30 September 2008 12:59:57 ext David Miller, you wrote:
> From: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
> Date: Wed, 24 Sep 2008 19:11:40 +0300
>
> > Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
>
> Applied.
>
> I took a look and noticed that if_phonet.h needs some top-level
> ifdef multiple inclusion protection.

Oops. Patch follows.

While we're on if_phonet.h, I also wonder what the "right" place for 
phonet_header_ops is... Currently in phonet.ko, any network device driver 
link-depends on the socket stack :-( for two tiny little header_ops 
callbacks. Is that OK? or should it go to core like the Ethernet ops, or be 
inline'd?

Regards,

-- 
Rémi Denis-Courmont
Maemo Software, Nokia Devices R&D

[PATCH] Protect if_phonet.h against multiple inclusions.

[Remi Denis-Courmont]

---
 include/linux/if_phonet.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/linux/if_phonet.h b/include/linux/if_phonet.h
index 7e98921..d70034b 100644
--- a/include/linux/if_phonet.h
+++ b/include/linux/if_phonet.h
@@ -5,14 +5,15 @@
  *
  * Copyright (C) 2008 Nokia Corporation. All rights reserved.
  */
+#ifndef LINUX_IF_PHONET_H
+#define LINUX_IF_PHONET_H
 
-#define PHONET_HEADER_LEN	8	/* Phonet header length */
-
-#define PHONET_MIN_MTU		6
-/* 6 bytes header + 65535 bytes payload */
-#define PHONET_MAX_MTU		65541
+#define PHONET_MIN_MTU		6	/* pn_length = 0 */
+#define PHONET_MAX_MTU		65541	/* pn_length = 0xffff */
 #define PHONET_DEV_MTU		PHONET_MAX_MTU
 
 #ifdef __KERNEL__
 extern struct header_ops phonet_header_ops;
 #endif
+
+#endif
-- 
1.5.4.3

Re: [PATCH] Protect if_phonet.h against multiple inclusions.

[David Miller]

From: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Wed,  1 Oct 2008 10:57:38 +0300

> ---
>  include/linux/if_phonet.h |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)

Applied thanks.

Please provide a proper Signed-off-by line in the future,
even for trivial patches such as this one.

Re: [PATCH 3/3] Phonet: declare headers

[David Miller]

From: "Rémi Denis-Courmont" <remi.denis-courmont@nokia.com>
Date: Wed, 1 Oct 2008 10:54:52 +0300

> While we're on if_phonet.h, I also wonder what the "right" place for 
> phonet_header_ops is... Currently in phonet.ko, any network device driver 
> link-depends on the socket stack :-( for two tiny little header_ops 
> callbacks. Is that OK? or should it go to core like the Ethernet ops, or be 
> inline'd?

The drivers are kind of useless without the socket layer
so it doesn't seem so awful to have this dependency.