From 5a50e60ac3fc35c50cf8811a3ee1e28c281df934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Thu, 2 May 2013 18:06:55 +0200
Subject: [PATCH] libnm-util: define NM_SETTING_GSM_BANDS_MAX - maximal value
 for allowed bands

and use it in 'allowed-bands' property installation.

The macro NM_SETTING_GSM_BANDS_MAX also allows libnm-util users to check
if bands are valid (before setting them).
---
 libnm-util/nm-setting-gsm.c | 16 +---------------
 libnm-util/nm-setting-gsm.h | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index 3ab018d1c..297bd434c 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -696,21 +696,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 		                    "Bitfield of allowed frequency bands.  Note that "
 		                    "not all devices allow frequency band control.",
 		                    NM_SETTING_GSM_BAND_UNKNOWN,
-		                    NM_SETTING_GSM_BAND_UNKNOWN
-		                     | NM_SETTING_GSM_BAND_ANY
-		                     | NM_SETTING_GSM_BAND_EGSM
-		                     | NM_SETTING_GSM_BAND_DCS
-		                     | NM_SETTING_GSM_BAND_PCS
-		                     | NM_SETTING_GSM_BAND_G850
-		                     | NM_SETTING_GSM_BAND_U2100
-		                     | NM_SETTING_GSM_BAND_U1800
-		                     | NM_SETTING_GSM_BAND_U17IV
-		                     | NM_SETTING_GSM_BAND_U800
-		                     | NM_SETTING_GSM_BAND_U850
-		                     | NM_SETTING_GSM_BAND_U900
-		                     | NM_SETTING_GSM_BAND_U17IX
-		                     | NM_SETTING_GSM_BAND_U1900
-		                     | NM_SETTING_GSM_BAND_U2600,
+		                    NM_SETTING_GSM_BANDS_MAX,
 		                    NM_SETTING_GSM_BAND_ANY,
 		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 2303f762b..306f62802 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -138,6 +138,30 @@ typedef enum {
 	NM_SETTING_GSM_BAND_U2600        = 0x00002000, /* WCDMA 3GPP UMTS 2600 MHz     (Class VII, internal) */
 } NMSettingGsmNetworkBand;
 
+/**
+ * NM_SETTING_GSM_BANDS_MAX:
+ *
+ * #NM_SETTING_GSM_BANDS_MAX macro indicate the maximal value that can be used
+ * as the allowed frequency bands (#NMSettingGsm:allowed-bands property).
+ *
+ * Since: 0.9.10
+ */
+#define NM_SETTING_GSM_BANDS_MAX (  NM_SETTING_GSM_BAND_UNKNOWN \
+                                  | NM_SETTING_GSM_BAND_ANY \
+                                  | NM_SETTING_GSM_BAND_EGSM \
+                                  | NM_SETTING_GSM_BAND_DCS \
+                                  | NM_SETTING_GSM_BAND_PCS \
+                                  | NM_SETTING_GSM_BAND_G850 \
+                                  | NM_SETTING_GSM_BAND_U2100 \
+                                  | NM_SETTING_GSM_BAND_U1800 \
+                                  | NM_SETTING_GSM_BAND_U17IV \
+                                  | NM_SETTING_GSM_BAND_U800 \
+                                  | NM_SETTING_GSM_BAND_U850 \
+                                  | NM_SETTING_GSM_BAND_U900 \
+                                  | NM_SETTING_GSM_BAND_U17IX \
+                                  | NM_SETTING_GSM_BAND_U1900 \
+                                  | NM_SETTING_GSM_BAND_U2600)
+
 typedef struct {
 	NMSetting parent;
 } NMSettingGsm;